Merge pull request #281 from FuzzyHobbit/patch-6