Revert "Fixes issue #10"

This reverts commit 8f0d51cc7ccfa7bcb119bfb51d09d716ecd59a48.