Added Dockerfile and tweaked to work in docker