fixed end_sampler bug
Merge branch 'CliffsBranch' into devel