Clean up segmentation
Merge pull request #7 from stefanv/cleanup/segment

Clean up segmentation