update changes for recent bug fixes
bump version to 1.0.7
Merge branch 'release/1.0.7' into develop