Merge pull request #5 from huangbolun/master

ff