Revert "Fixes Issue #22 & #38"

This reverts commit 2979b02b6c8192dc1bfc70674da93762210e1dc1.