Merge branch 'release/0.2.2'
rearrange code
Merge branch 'hotfix/0.2.3' into develop