Revert "Closes #53"

This reverts commit d6f5a0afe0a9263d54593dd390e83d3f4f70e480.