Merge pull request #41 from MilesChou/develop

修正功能