Fixes Issue #33
Merge pull request #34 from Rythix/master

Fixes Issue #33