Anonymous - 2017-10-01

Originally posted by: Killeroo

Also switch listening to use async so we can check for exitEvent