Very basic observer (+ fixes)
Merge branch 'master' of github.com:Maxima42/whitenight-server