Simplify segmentation of samples
Merge pull request #9 from ckolek/update_segmentation

Simplify segmentation of samples