Updates
Merge remote-tracking branch 'origin/2.0'

Conflicts:
	README.md