fixing a bug in sample helper
Merge remote-tracking branch 'origin/master'