fix urls
update answer
Merge branch 'master' into gh-pages
fix typo