Potential fix for issue #291
Merge pull request #292 from colinbull/develop

Potential fix for issue #291