Merge pull request #1 from mfrellum/dockertest

Update Dockerfile
Merge pull request #2 from mfrellum/dockertest

Update Dockerfile
Merge pull request #3 from mfrellum/master

Update Dockerfile