bug fix
Merge branch 'release/v0.2.1'