copy sample
Merge branches 'master' and '6'