Merge pull request #3 from xiaolinggithub/master

1