Merge pull request #1 from tcpcloud/docker

Support for docker