changes to sample
Merge branch 'dev'