Merge pull request #38 from Naktibalda/master

Implemented tie breaking rules #15