Merge pull request #2 from navartia/development

Development
Merge pull request #5 from navartia/august

Merge pull request #2 from navartia/development