v2 config
Merge pull request #36 from harikt/configv2

v2 config