ubub
Merge branch 'master' into ubuntu

Conflicts:
	README.md
Merge branch 'ubuntu'