Everything looks great in this pull request, it's really awesome. Just one question, is the `while True` loop required here?