Revert "Merge pull request #15 from FearFree/master"

This reverts commit 2bd481f8e8cb5187112054d23dce13e2966cda84, reversing
changes made to f2251144c9e6f27b0a2afb84eca9ccfc9a89f543.