Fix for #314
Merge pull request #318 from paulej72/master

Fix for #314