Merge pull request #1 from maying/master

CR
going crazy
manual merge