Merge pull request #2 from ricardobaumann/master

Merge pull request #1 from ricardobaumann/develop
Merge pull request #3 from ricardobaumann/develop

Merge pull request #2 from ricardobaumann/master