minor syntax/ws fix
Merge branch 'master' into integration