fix #11
Merge branch 'release/v0.2.7'