multiple relations fixed
Merge branch 'urumov'