Fixes #563
Merge pull request #629 from h2g2guy/master

Fixes #563