Found a better way to manage the redirections. resolve #12