Merge pull request #1 from YoungjaeKim/master

merge