Fix infinite loop
Merge pull request #18 from jasonhotsauce/master

Fix infinite loop