Closes #174

Closes #174