Merge branch 'release/v0.0.2-refactor'