Merge pull request #20 from juancjara/development

Development
Merge pull request #21 from juancjara/master

Merge pull request #20 from juancjara/development