Updated listen to 2.1.0 and also merged #31

I don't expect this to be merged, but hope this is a nice discussion piece to fix the listen issue.

That #31 is merged into this is because i'm too lazy to remove it and needed it.