Revert "Merge pull request #35 from Lycaonj/master"

This reverts commit 46fb3c84e6c9b0cd4717f50a0d8f5d0dc90b3a9b, reversing
changes made to 002438d0c0e5467c7146c62501ce6e67233437f0.
Prep for release