Various minor fixes
Force accept header
Fix demo
Merge branch 'master' into gh-pages