Fixes #60
Merge pull request #61 from BibbyTube/Dev

Hotfix for #60