Revert "Merge pull request #18 from KonstKhrist/master"

This reverts commit 27abf917025f2226ab5e733c027f45928b701ae1, reversing
changes made to 2ae5d1497a679a7ba815b762284cdb8518bd7aad.