Readme edits, fixes #1

Merge two branch.