Merge branch 'master' into release
minor refactoring and added assets
Merge branch 'release'