Nick taken fix
Merge branch 'development' of https://github.com/prawnsalad/KiwiIRC into development