Closes #98

Closes #98