settings and sample
Merge remote-tracking branch 'origin/master'