first week zhang haoran
Merge pull request #2 from Moonant/master

first week-- zhang haoran
commit
Merge remote-tracking branch 'upstream/master'