Fix weird redirect behavior
Merge pull request #236 from adicu/redirect

Fix weird redirect behavior