Merge pull request #395 from halt-hammerzeit/master