refactor & update
Merge branch 'master' into develop