Merge pull request #19 from Raysmond/raysmond

Raysmond
Merge branch 'master' into raysmond