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