Merge pull request #1 from DITgroup2/master

update by john ok