Revert "Merge pull request #13 from pshatara/master"

This reverts commit 9325a49b780deb2d0a72849c3320ef77dda5b002, reversing
changes made to c7dd2b7d2f72fad7c1f4df20870ca2a8965ca11f.