Temporary commit
Add config loader
Merge branch 'config' into develop