Revert "Merge pull request #22 from mauriciobomfim/master"

This reverts commit f71d8b4329c81ef2aa4a7bdf43b7f6491b9af618, reversing
changes made to 661e6855dbb2bbc10d6aed0322d873920067655e.