Merge pull request #63 from juancjara/development

Development
fixed
fixed
fixed
Merge branch 'master' into development