Merge pull request #247 from Wedmer/master