Revert "Merge pull request #1 from gil0mendes/master"

This reverts commit a1bef7f07f84f27751c0ed53c1e996c1b582c9ed, reversing
changes made to dfef9e15f19cedebdbe46f8109f232b676cdb962.