Revert "Closes #14"

This reverts commit bbe81935ef22f2233ced2f6b0c802fb075d0be69.