Fix: url
Fix: assets links
Merge branch 'master' into gh-pages