fixes link type changed issue in #142
Merge remote-tracking branch 'origin/ribbons' into ribbons