Update README.md
Update README.md
merge dev into master
clean up readme