Merge pull request #22 from MiguelABarbosa/master

Merge pull request #21 from MiguelABarbosa/develop
Merge pull request #23 from MiguelABarbosa/develop

Merge pull request #22 from MiguelABarbosa/master