Merge pull request #4 from danieldahan/development

Development
Merge pull request #5 from danieldahan/master

Merge pull request #4 from danieldahan/development