Link to github repo
Merge branch 'master' into gh-pages
Merge issues