Changed default directory in samples
config sample changes
Merge remote-tracking branch 'origin/master'