Revert "Merge pull request #31 from LuisMuniz/master"

This reverts commit bd40cf1ee25bd9d292640e1395842afab91aa0ea, reversing
changes made to 6bd7b8f4ec6d88d48b6d0cae618e71863c1ee7fc.