Revert "Merge pull request #20 from vladislavdonchev/develop"

This reverts commit 02ea3b87630cb3f293853aa81f103d5cf39e9967, reversing
changes made to 2ef626af7488f096a1d4e7cc9967ddfab6979832.