first impl. of issue #107
Merge remote-tracking branch 'origin/ribbons' into ribbons