fixes #120
Merge pull request #121 from lloydwatkin/master

Fixes #120