Previous merge omitted file
Merge pull request #18 from thoozaho/master

Previous merge omitted file