Merge remote-tracking branch 'origin/master'
Update instructions on how to handle ties

Fixes #336