took account for ties
Merge branch 'develop'