continued work on segmenter
Merge remote branch 'origin/schedule' into schedule
fixed the merge conflict