Closes #78

Closes #78