Merge pull request #1 from osadi/development

Development
Sanity checks
Merge branch 'development'