Updated for secure websockets
Merge branch 'master' into production