Fixes #301
Merge pull request #302 from markrendle/301

Fixes #301