Fixes #372
Merge pull request #373 from adamvert/master

Fixes #372