Algorithm improvements based on Leonard's comments
Merge branch 'master' of https://github.com/leonardpunt/software-testing