Some minor modification
Merge branch 'release/0.1'