Revert "Merge pull request #30 from nferraz/master"

This reverts commit c75c623a6a5f0c7d4fda7469f754fc40f911fc1c, reversing
changes made to 9e6e1d5da03995cda38364a50d0b456441236524.

This merge broke the code