Code

Try to close #240 via commit. Closes: #240