Improve Dockerfile per issue #1 discussion