Merge branch 'master' into gh-pages
add web.config
remove thi
merge upstream