Merge pull request #94 from DominikTo/master

Updated docker base image