Merge pull request #4 from tracylyh123/master