Merge pull request #542 from DavisNT/master

Separated whitelisting and redirections
Text adjustment
Merge remote-tracking branch 'upstream/master'