server side fixes
Merge branch 'master' of ssh://github.com/benvanstaveren/statterbox