Add DEMO link.
Some formatting.
Merge branch 'master' into gh-pages