Version 0.1.6

Merging in #27 and #33. 
Should also fix #26.
```javascript
listener === listener
```

Eh, "derp" on my behalf.