Merge pull request #390 from baulig/master