Merge pull request #1 from andreoav/development

Development -> Master
Merge pull request #2 from andreoav/development

Updating master repository
Merge branches 'master' and 'development'
Merge branch 'development'
Warden as submodule