Fix config and data load
Merge pull request #2 from dnprock/master

Fix config and data load