Better configuration
Merge pull request #47 from telehash/better-config

Better configuration