fgallina Merge pull request #10 from aspiers/mode-whitelist