Fix regression due to 353d261
Merge pull request #554 from M2Ys4U/cleanup

Fix regression due to 353d261
Merge remote branch 'KiwiIRC/development' into simosnap