Merge pull request #13 from garcha/development

push to master
Merge pull request #14 from garcha/master

Merge pull request #13 from garcha/development