Merge pull request #1 from rcabral90/master

revised version
Merge pull request #2 from davu/master

Pulling again.