Release 1.0
Merge branch 'release-1.0' into develop
Testing branching
Merge pull request #1 from finger75/develop

My changes