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

This reverts commit 4edc631111a93e254ef4e4aea6d56effe31a797a, reversing
changes made to 1195f33f31479800faf0997ca34a5261f1ec4164.