Added info text and did some minor style changes.
Merge branch 'master' into gh-pages