Fix the WebRTC connection establishment
Merge pull request #153 from tOkeshu/fix-webrtc-establishment

Fix the WebRTC connection establishment
sync with master