Merge pull request #24 from juancjara/master

update dev
updates
Merge pull request #25 from juancjara/development

Development