fixes #40
Merge remote-tracking branch 'origin/ribbons' into ribbons