Merge branch 'master' into Update
code cleanup
Merge branch 'Update'