updates from master
add file-uri-scheme to gh-pages branch