Merge pull request #3 from ScienceWorldCA/development

Development
Merge branch 'master' into development