Load config within index.php
Merge branch 'master' into bug_2