More accurate description of segment states
Merge branch 'release/v0.2.0'