Update README.md
merged master to dev