Merge branch 'master' into raysmond
few changes
Merge branch 'raysmond'