Fix Issue #18
Merge pull request #22 from lagbox/issue/18

Fix Issue #18