Merge pull request #1 from masciugo/master

merge upstream master with branch master
Update README.md
Update README.md
Merge branch 'estensland-readme_update'