Fixing redirects, closes #67, closes #68
(cherry picked from commit 59f5408)