Upgrade to listen 2.x

This will resolve #4