Merge pull request #1 from tangbo2013/develop

Develop