Fixes #678
Merge pull request #679 from mcarrierastonish/master

Fixes #678