Merge branch 'toys-label-improvements' into 'master'

Add full control over expansion text labels. Closes #22.

Closes #22

See merge request !50