Revert "Merge pull request #45 from febbraro/master"

This reverts commit 86024b2ecc467a660fbacb6e373c5a263e7fca9b, reversing
changes made to 298e2907d34a19061404b37742affe128c1694bb.