Merge pull request #347 from jauler/master