[UPDATE] minor changes and fixes
Merge branch 'development'
Merge branch 'master' into development