fix #1
fix #3
Merge branch 'release/v0.2.5'