Revert "Issue #91"

This reverts commit 54e9658752e713af76e49e1626fcb9183937572d.