Standalone workaround
Merge pull request #80 from Jonty800/master

Standalone workaround