Ulfgard Merge pull request #260 from HaoZeke/patch-1