Fixed forever loop
Merge pull request #260 from pjackson28/fixforeverloop

Fixed forever loop