Update
Update
Update
Merge branch 'dev'

Conflicts:
	Dockerfile
	README.md