Fixes #197 hopefully.
Merge pull request #209 from lloydwatkin/master

Fixes #197 hopefully.