[UPDATE] minor optimization & cleanup
Merge branch 'development'
Merge branch 'master' into development