Fixes links
Merge branch 'master' into feat/aws