Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/b79789/ASD into gh-pages

This reverts commit c29c162c1d62b8d2dac9511b73097914b5636884.