Merging Master to docker