Merge pull request #272 from tobiasd/20150706-mods