Merge pull request #208 from gavincornwell/master

Improvements to last commit following pull request review.