Revert "ISSUE #11"

This reverts commit 1d595727a0e9e6e6a2071a13287b9c034b63b09e.