20140805
Merge pull request #4 from wuyinan0126/master

20140805