Adding extra fields, and updating README
Merge branch 'master' into gh-pages
Merging in new fields changes