more shit
Merge pull request #2 from yanglinz/master

more shit