preventing inifinite loop
Merge pull request #32 from DryTuna/duy

preventing inifinite loop