Update README.md
Merge remote-tracking branch 'waag/master' into dev

Conflicts:
	README.md