Fixes #2 (partially)
Fixed 404 redirection