Revert "Closes #28"

This reverts commit 02a24f4585e944127d59432e00185ea84cce29d3.