Updates to fix some compiler warnings
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'develop'
bump version