Merge pull request #6 from tcpcloud/config

LGTM