Merge branch 'release/1.0'
Made a simple change
Merge branch 'develop' of https://github.com/MRhyne1931/testjgitflow into develop