Revert "Merge pull request #21 from najela/master"

This reverts commit 6b086604add9bf07399009206edfb7876c023b83, reversing
changes made to c5cf061abb7ae9b5ff6125ab2f1fce8f2856bbb5.