work
Merge remote-tracking branch 'chtijbug/master'

Conflicts:
	Dockerfile