Fix for #321
Merge pull request #353 from paulej72/master

Fix for #321