fix link working, duh
Merge branch 'master' into gh-pages