refactor prepare for release
Merge branch 'release'