added static config handling
updated config loading
Merge branch 'master' into 0.0.x-dev