Pete King - ixes #310
Merge pull request #727 from ralfharing/master

Pete King - fixes #310