README update, fixes #6
Merge branch 'master' into gh-pages