Revert "Merge pull request #14 from marvinone/master"

This reverts commit c148b2d52429b4e359b5a036ffc13e918e8e37e9, reversing
changes made to e8ce2c2a2fd82e84a5a330eb1cf4546f7327297d.