removed debug
Merge branch 'master' into server