prevent infinite loop
new
new
fix
Merge pull request #167 from sidschingis/master

fix
Merge remote-tracking branch 'upstream/master'