Merge pull request #2 from jbaragli/master

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

Merge pull request #2 from jbaragli/master