Merge pull request #42 from fengjingchao/dev

Dev