20140729
abc
Merge pull request #3 from yz784667921/master

3syns from zhege