Merge pull request #273 from sbesson/rebased/develop/redirected_links

Redirected links (rebased onto develop)