fix #2
Merge branch 'release/v0.2.6'