Path issues for the demo.
Merge branch 'master' into gh-pages