Fixed the clans bug, but going up from daughter to a father still is incorrect
Merge remote-tracking branch 'origin/master'