some small update on configs and approach
Merge remote-tracking branch 'origin/master'