Adding functionality to handle redirector
Merge remote-tracking branch 'origin/master'