Merge pull request #17 from joohnok/master

Merge pull request #3 from DITgroup2/master