Merge pull request #4 from erdvillegas/develop

Merge pull request #3 from erdvillegas/master
Revert "Merge pull request #3 from erdvillegas/master"
Merge pull request #5 from erdvillegas/revert-4-develop

Revert "Merge pull request #3 from erdvillegas/master"