Fixed Config loading
Merge origin/master