Closes #152

Closes #152