Modified Some 2 for Merge

이래도 안되면 죽자!!!
Merge pull request #15 from MikeJeong/master

Merge