Merge branch 'master', remote-tracking branch 'upstream/master'
added whitelisting
Merge pull request #2 from ulchm/whitelist

Whitelist