Rough support for inline segments
Merging in master branch
Merge branch 'inline-segments'