Merge pull request #7 from acastaner/development

Merging into master
Merge pull request #18 from acastaner/master

Merge pull request #7 from acastaner/development