Merge pull request #34 from MilesChou/develop

Refactoring