fixed the way looping works, no duplicate matches
Merge branch 'master' of https://github.com/elanas/Shuq