Finish #127
Finish v0.7.15
Merge branch 'master' into develop
version bump 0.7.16
Finish v0.7.16