Merge pull request #261 from grml/mika/stretch