Change from @andreaturli for Docker port forwarding
Merge pull request #1420 from grkvlt/fix/docker

Change from @andreaturli for Docker port forwarding