Merge pull request #288 from stefan-misik/master