Merge pull request #84 from jorgesilva/develop

Catching up to develop branch
Revert "Merge pull request #83 from ericwan78/issue-70"

This reverts commit 96c4fe4f1bcc78d01b8f3cea9712d5efac6d0deb, reversing
changes made to 284247324c6681d0253a856e0d4e655896673ce3.