Initial commit
Update README.md
merge upstream