Fix for loops
Merge remote-tracking branch 'upstream/master'
Merge pull request #52 from cmanou/master

Maybe itll work this time