Merge branch 'release/0.0.7'
corrections
Merge branch 'master' into develop