updated and fixed samples
Merge branch 'samples-dev'