Merge pull request #8 from Chwang1234/master

test