bugfixing: isAncestor was not working correctly
Merge remote-tracking branch 'origin/ribbons' into ribbons