Merge remote-tracking branch 'origin/new'

Conflicts:
	Dockerfile
	README.md