refactoring code
Merge branch 'release/0.2.2' into develop

* release/0.2.2:
  refactoring code