Merge pull request #4 from DITgroup2/master

Merge pull request #17 from joohnok/master
Merge pull request #18 from joohnok/master

Merge pull request #4 from DITgroup2/master