Merge pull request #33 from xiatao123/master

pull my code
Merge remote-tracking branch 'upstream/master'