Merge pull request #1 from angelleng/master

shishang