Closes #167

Closes #167