Merge branch 'develop'
fix
fix banner
update
Merge branch 'master' into develop