Merge branch 'beta'

Conflicts:
	README.md
Updating the Readme
Merge branch 'master' into beta