Create README.md
Update README.md
Merge dev/master into dev