Merge pull request #1 from roykim79/master

merge