Minor update
Merge branch 'release/1.0' into develop
Merging the release back into develop