Nasty on listeners. Don't know why I used them in the first place
Merge branch 'master' of github.com:elliottisonfire/tastybeers