fix issue #1
Merge branch 'release/0.2.0'