Revert "Fixes issue #30"

This reverts commit 9d5bb5ddf5c1ba30c47fa706385ee8979343f294.
Closes issue #30