Merge pull request #2 from rpiccio/development

Development