v0.1.1 - Fixing broken listener support