merge with ksk kej
final merge
Merge pull request #18 from KimMinJeong/ksk_branch

Ksk branch