Merge pull request #456 from Struart88/patch-2