Update config class and tests
Merge pull request #18 from bkkrw/master

Update config class and tests