Readme Edit Fix #1

Merge master and readme-edits