Merge pull request #7 from acastaner/development

Merging into master