Configuration fixes :)
Merge branch 'working'
Merge