Closes #26

Closes #26