merge dev into master, update README.md