Merge pull request #41 from crimsonxiii/issue/40

Fixes #40