Merge pull request #38 from sonndinh/consistent-docker-local-environm…

Merge pull request #38 from sonndinh/consistent-docker-local-environm… #47