Revert "Merge pull request #13 from xaque208/fixes"

This reverts commit 041acb6085d6998cbcf1671e3dea278a75d0b710, reversing
changes made to e4366fa8d8b423c49e4316e7a83b9a10b43943cc.
Revert "Merge pull request #11 from skoef/master"

This reverts commit e4366fa8d8b423c49e4316e7a83b9a10b43943cc, reversing
changes made to 2f49155a641575ca74a58657c24066b253f73809.