Revert "Merge pull request #61 from jatitoam/develop"

This reverts commit b60a7b24622e47520337c38ccd1cb858bb23dc85, reversing
changes made to da56996140201ecc749907c9a0b5e5f37a1c6c26.