Update Dockerfile
Merge remote-tracking branch 'S64/master'