Backwards merge into dev

Pulling in changes to readme from master.