Fixed the infinite loop from #137. The code still does not work, but now it does not work in a more reasonable way
I really should learn to test my commits
Merge pull request #212 from Gallopsled/infloop_in_listen

Fixed the infinite loop from #137. The code still does not work, but now it does not work in a more reasonable way