Revert "Merge pull request #34 from rlobo3/master"

This reverts commit f912223238a937625b20cde70cfedccc60b89266, reversing
changes made to ad2e48cb035ffbef04942cc23bee1681984adfbb.