minor changes
Merge branch 'release/0.16'