refactored config handling
Merge branch 'master' into develop
fixed env
readme and setup update