fixed links
Merge branch 'master' into dev/master