Merge pull request #1 from TieWei/develop

add hotfix