Revert "Merge pull request #52 from marekzelinka/master"

This reverts commit 26be932b30e42d6d5260713339b8e3973de59957, reversing
changes made to d2887bd0a911c25f1d9ecf451e75cf737ec53dbb.