Revert "Merge pull request #6 from rejsmont/master"

This reverts commit 6c984aabfa52eff8dc9f8de826a7401600b85e9a, reversing
changes made to 6df39eb321a3f56793215fc633429848892b3bae.