Update the links
Merge branch 'develop'