Implemented #47
Merge pull request #48 from h4cc/patch-1

Implemented #47