Merge pull request #205 from phhusson/fix-docker