Dirty hack to resolve issue #104
Merge pull request #117 from wireghoul/master

Dirty hack to resolve issue #104