BPS-574
Merge pull request #7 from firzhan/master

BPS-574 config file changes