Merge branch 'release/refactor'
Merge branch 'release/v0.3.8'
update