Merge pull request #1 from elemento15/development

Changes