Fixes #550
Merge pull request #554 from heatherleaf/master

Fixes #550