merge of latest Dockerfile and test fixes #18

Closed realmarcin closed 4 years ago