merge
Merge pull request #17 from KimMinJeong/kej_branch

merge