Master to gh-pages, resolves #328