taeyen 2nd commit
Merge pull request #1 from taeyen/master

taeyen 2nd commit