Update README.
Merge dev into master.