Possible fix for infinite loop
Merge pull request #139 from Rotem12/master

Possible fix for infinite loop