Refactored configuration loading
Merge branch 'master' of https://github.com/elcct/defaultproject