fix problems with server
Merge branch 'master' into server