Merge pull request #295 from simonjwright/master