Merge pull request #1 from cloudwu/master

sync code 0.6.1