Dirty quick fix for issue #20
Merge pull request #21 from rac2030/master

Dirty quick fix for issue #20, remove when issue is fixed