Revert "Merge pull request #50 from AlmirKadric/master" in favor of PR

This reverts commit 6674cb40e9614f94eee970607668b204d8bb493d, reversing
changes made to 44bb086c96bf2e100f8ad149877bc6f2bce53a10.
Merge pull request #57 from apenney/revert

Revert "Merge pull request #50 from AlmirKadric/master" in favor of PR