Merge pull request #1 from jiafulow/master

Trying to get your code