Merge pull request #266 from FuzzyHobbit/patch-1