1024
merge with ksk
Merge pull request #49 from KimMinJeong/kej_branch

Kej branch