Revert "Develop"
Merge pull request #3 from carlwang87/revert-2-develop

Revert "Develop"