Revert "Issue #13"

This reverts commit dc40862d249b13a5b6c3d40f8fe780d0cac0ecad.