fixes issues #70 and a part #83
Merge remote-tracking branch 'origin/ribbons' into ribbons