Merge pull request #4 from Raysmond/raysmond

Raysmond
Merge branch 'raysmond'
Merge branch 'master' into raysmond