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