Fixed #124 for a hopefully last time.
Merge pull request #128 from frmwrk123/fix/redirect

Fixed #124 for a hopefully last time.