Merge pull request #21 from KimMinJeong/master

Merge pull request #20 from KimMinJeong/kej_branch