Merge pull request #1 from DITgroup2/master

update by john ok
Merge pull request #14 from hufi/master

Merge pull request #1 from DITgroup2/master
Merge pull request #15 from joohnok/master

Merge pull request #2 from DITgroup2/master
Merge pull request #2 from DITgroup2/master

test sabee
Merge pull request #16 from hufi/master

Merge pull request #2 from DITgroup2/master
Merge pull request #3 from DITgroup2/master

test2