Merge pull request #4 from carlchen0928/master

merge