Merge pull request #2 from DITgroup2/master

test
Merge pull request #15 from joohnok/master

Merge pull request #2 from DITgroup2/master