some modifications to fix issues #74, #71, #70
Merge remote-tracking branch 'origin/ribbons' into ribbons