Fixed redirect loop pointed out by Frank Olivier at Microsoft.
Merge pull request #373 from kenrussell/redirect

Fixed redirect loop pointed out by Frank Olivier at Microsoft.