Merge pull request #13 from garcha/development

push to master