Revert "Merge"
Merge pull request #3 from jpeng0823/revert-2-master

Revert "Merge"