Merge pull request #1 from Stormatree/development

Development
Merge pull request #2 from Stormatree/development

Development
Merge remote-tracking branch 'origin/master' into development
.gitignore update