Merge pull request #183 from eestrada/master

Revert "Merge pull request #182 from eestrada/master"