Revert "Merge pull request #33 from gkandemi/master"

This reverts commit 4ae861cb85538cbbe896872127b825d55e050614, reversing
changes made to bbe182f7422e36be3e85476e3a4929613741913c.