diff --git a/lib/call.js b/lib/call.js
index b3574b8..1fe7dff 100644
--- a/lib/call.js
+++ b/lib/call.js
@@ -1,356 +1,356 @@
 'use strict';
 
 import debug from 'debug';
-import uuid from 'node-uuid';
+import uuidv4 from 'uuid/v4';
 import utils from './utils';
 
 import { EventEmitter } from 'events';
 
 const DEBUG = debug('sylkrtc:Call');
 
 
 class Call extends EventEmitter {
     constructor(account) {
         super();
         this._account = account;
         this._id = null;
         this._direction = null;
         this._pc = null;
         this._state = null;
         this._terminated = false;
         this._incomingSdp = null;
         this._localIdentity = new utils.Identity(account.id, account.displayName);
         this._remoteIdentity = null;
         this._dtmfSender = null;
 
         // bind some handlers to this instance
         this._onDtmf = this._onDtmf.bind(this);
     }
 
     get account() {
         return this._account;
     }
 
     get id() {
         return this._id;
     }
 
     get direction() {
         return this._direction;
     }
 
     get state() {
         return this._state;
     }
 
     get localIdentity() {
         return this._localIdentity;
     }
 
     get remoteIdentity() {
         return this._remoteIdentity;
     }
 
     getLocalStreams() {
         if (this._pc !== null) {
             return this._pc.getLocalStreams();
         } else {
             return [];
         }
     }
 
     getRemoteStreams() {
         if (this._pc !== null) {
             return this._pc.getRemoteStreams();
         } else {
             return [];
         }
     }
 
     answer(options = {}) {
         if (this._state !== 'incoming') {
             throw new Error('Call is not in the incoming state: ' + this._state);
         }
 
         if (!options.localStream) {
             throw new Error('Missing localStream');
         }
 
         const pcConfig = options.pcConfig || {iceServers:[]};
         const answerOptions = options.answerOptions;
 
         // Create the RTCPeerConnection
         this._initRTCPeerConnection(pcConfig);
 
         this._pc.addStream(options.localStream);
         this.emit('localStreamAdded', options.localStream);
         this._pc.setRemoteDescription(
             new RTCSessionDescription({type: 'offer', sdp: this._incomingSdp}),
             // success
             () => {
                 utils.createLocalSdp(this._pc, 'answer', answerOptions)
                     .then((sdp) => {
                         DEBUG('Local SDP: %s', sdp);
                         this._sendAnswer(sdp);
                     })
                     .catch((reason) => {
                         DEBUG(reason);
                         this.terminate();
                     });
             },
             // failure
             (error) => {
                 DEBUG('Error setting remote description: %s', error);
                 this.terminate();
             }
         );
     }
 
     terminate() {
         if (this._terminated) {
             return;
         }
         DEBUG('Terminating call');
         this._sendTerminate();
     }
 
     sendDtmf(tones, duration=100, interToneGap=70) {
         DEBUG('sendDtmf()');
         if (this._dtmfSender === null) {
             if (this._pc !== null) {
                 let track = null;
                 try {
                     track = this._pc.getLocalStreams()[0].getAudioTracks()[0];
                 } catch (e) {
                     // ignore
                 }
                 if (track !== null) {
                     DEBUG('Creating DTMF sender');
                     this._dtmfSender = this._pc.createDTMFSender(track);
                     if (this._dtmfSender) {
                         this._dtmfSender.addEventListener('tonechange', this._onDtmf);
                     }
                 }
             }
         }
         if (this._dtmfSender) {
             DEBUG('Sending DTMF tones');
             this._dtmfSender.insertDTMF(tones, duration, interToneGap);
         }
     }
 
     // Private API
 
     _initOutgoing(uri, options={}) {
         if (uri.indexOf('@') === -1) {
             throw new Error('Invalid URI');
         }
 
         if (!options.localStream) {
             throw new Error('Missing localStream');
         }
 
-        this._id = uuid.v4();
+        this._id = uuidv4();
         this._direction = 'outgoing';
         this._remoteIdentity = new utils.Identity(uri);
 
         const pcConfig = options.pcConfig || {iceServers:[]};
         const offerOptions = options.offerOptions;
 
         // Create the RTCPeerConnection
         this._initRTCPeerConnection(pcConfig);
 
         this._pc.addStream(options.localStream);
         this.emit('localStreamAdded', options.localStream);
         utils.createLocalSdp(this._pc, 'offer', offerOptions)
             .then((sdp) => {
                 DEBUG('Local SDP: %s', sdp);
                 this._sendCall(uri, sdp);
             })
             .catch((reason) => {
                 DEBUG(reason);
                 this._localTerminate(reason);
             });
     }
 
     _initIncoming(id, caller, sdp) {
         this._id = id;
         this._remoteIdentity = new utils.Identity(caller.uri, caller.display_name);
         this._incomingSdp = sdp;
         this._direction = 'incoming';
         this._state = 'incoming';
         DEBUG('Remote SDP: %s', sdp);
     }
 
     _handleEvent(message) {
         DEBUG('Call event: %o', message);
         switch (message.event) {
             case 'state':
                 const oldState = this._state;
                 const newState = message.data.state;
                 this._state = newState;
                 const data = {};
 
                 if (newState === 'accepted' && this._direction === 'outgoing') {
                     const sdp = utils.mungeSdp(message.data.sdp);
                     DEBUG('Remote SDP: %s', sdp);
                     this._pc.setRemoteDescription(
                         new RTCSessionDescription({type: 'answer', sdp: sdp}),
                         // success
                         () => {
                             // fake 'established' state change
                             this._state = 'established';
                             this.emit('stateChanged', oldState, 'established', {});
                         },
                         // failure
                         (error) => {
                             DEBUG('Error accepting call: %s', error);
                             this.terminate();
                         }
                     );
                     DEBUG('Call accepted');
                     this.emit('stateChanged', oldState, newState, data);
                 } else if (newState === 'established' && this._direction === 'outgoing') {
                     // TODO: remove this
                     this._state = oldState;
                 } else {
                     if (newState === 'terminated') {
                         data.reason = message.data.reason;
                         this._terminated = true;
                         this._account._calls.delete(this.id);
                         this._closeRTCPeerConnection();
                     }
                     this.emit('stateChanged', oldState, newState, data);
                 }
                 break;
             default:
                 break;
         }
     }
 
     _initRTCPeerConnection(pcConfig) {
         if (this._pc !== null) {
             throw new Error('RTCPeerConnection already initialized');
         }
 
         this._pc = new RTCPeerConnection(pcConfig);
         this._pc.addEventListener('addstream', (event) => {
             DEBUG('Stream added');
             this.emit('streamAdded', event.stream);
         });
         this._pc.addEventListener('icecandidate', (event) => {
             if (event.candidate !== null) {
                 DEBUG('New ICE candidate %o', event.candidate);
             } else {
                 DEBUG('ICE candidate gathering finished');
             }
             this._sendTrickle(event.candidate);
         });
     }
 
     _sendRequest(req, cb) {
         this._account._sendRequest(req, cb);
     }
 
     _sendCall(uri, sdp) {
         const req = {
             sylkrtc: 'session-create',
             account: this.account.id,
             session: this.id,
             uri: uri,
             sdp: sdp
         };
         this._sendRequest(req, (error) => {
             if (error) {
                 DEBUG('Call error: %s', error);
                 this._localTerminate(error);
             }
         });
     }
 
     _sendTerminate() {
         const req = {
             sylkrtc: 'session-terminate',
             session: this.id
         };
         this._sendRequest(req, (error) => {
             if (error) {
                 DEBUG('Error terminating call: %s', error);
                 this._localTerminate(error);
             }
             this._terminated = true;
         });
         setTimeout(() => {
             if (!this._terminated) {
                 DEBUG('Timeout terminating call');
                 this._localTerminate('200 OK');
             }
             this._terminated = true;
         }, 150);
     }
 
     _sendTrickle(candidate) {
         const req = {
             sylkrtc: 'session-trickle',
             session: this.id,
             candidates: candidate !== null ? [candidate] : [],
         };
         this._sendRequest(req, null);
     }
 
     _sendAnswer(sdp) {
         const req = {
             sylkrtc: 'session-answer',
             session: this.id,
             sdp: sdp
         };
         this._sendRequest(req, (error) => {
             if (error) {
                 DEBUG('Answer error: %s', error);
                 this.terminate();
             }
         });
     }
 
     _closeRTCPeerConnection() {
         DEBUG('Closing RTCPeerConnection');
         if (this._pc !== null) {
             for (let stream of this._pc.getLocalStreams()) {
                 utils.closeMediaStream(stream);
             }
             for (let stream of this._pc.getRemoteStreams()) {
                 utils.closeMediaStream(stream);
             }
             this._pc.close();
             this._pc = null;
             if (this._dtmfSender !== null) {
                 this._dtmfSender.removeEventListener('tonechange', this._onDtmf);
                 this._dtmfSender = null;
             }
         }
     }
 
     _localTerminate(error) {
         if (this._terminated) {
             return;
         }
         DEBUG('Local terminate');
         this._account._calls.delete(this.id);
         this._terminated = true;
         const oldState = this._state;
         const newState = 'terminated';
         const data = {
             reason: error.toString()
         };
         this._closeRTCPeerConnection();
         this.emit('stateChanged', oldState, newState, data);
     }
 
     _onDtmf(event) {
         DEBUG('Sent DTMF tone %s', event.tone);
         this.emit('dtmfToneSent', event.tone);
     }
 }
 
 
 export { Call };
diff --git a/lib/conference.js b/lib/conference.js
index c8a0241..66925f0 100644
--- a/lib/conference.js
+++ b/lib/conference.js
@@ -1,510 +1,510 @@
 'use strict';
 
 import debug from 'debug';
-import uuid from 'node-uuid';
+import uuidv4 from 'uuid/v4';
 import utils from './utils';
 
 import { EventEmitter } from 'events';
 
 const DEBUG = debug('sylkrtc:Conference');
 
 
 class Participant extends EventEmitter {
     constructor(publisherId, identity, conference) {
         super();
-        this._id = uuid.v4();
+        this._id = uuidv4();
         this._publisherId = publisherId;
         this._identity = identity;
         this._conference = conference;
         this._state = null;
         this._pc = null;
     }
 
     get id() {
         return this._id;
     }
 
     get identity() {
         return this._identity;
     }
 
     get conference() {
         return this._conference;
     }
 
     get state() {
         return this._state;
     }
 
     get streams() {
         if (this._pc !== null) {
             return this._pc.getRemoteStreams();
         } else {
             return [];
         }
     }
 
     attach() {
         if (this._state !== null) {
             return;
         }
         this._setState('progress');
         this._sendAttach();
     }
 
     detach() {
         if (this._state !== null) {
             this._sendDetach();
         }
     }
 
     _setState(newState) {
         const oldState = this._state;
         this._state = newState;
         DEBUG(`Participant ${this.id} state change: ${oldState} -> ${newState}`);
         this.emit('stateChanged', oldState, newState);
     }
 
     _handleOffer(offerSdp) {
         DEBUG('Handling SDP for participant offer: %s', offerSdp);
 
         // Create the RTCPeerConnection
         const pcConfig = this.conference._pcConfig;
         const pc = new RTCPeerConnection(pcConfig);
         pc.addEventListener('addstream', (event) => {
             DEBUG('Stream added');
             this.emit('streamAdded', event.stream);
         });
         pc.addEventListener('icecandidate', (event) => {
             if (event.candidate !== null) {
                 DEBUG('New ICE candidate %o', event.candidate);
             } else {
                 DEBUG('ICE candidate gathering finished');
             }
             this._sendTrickle(event.candidate);
         });
         this._pc = pc;
 
         // no need for a local stream since we are only going to receive media here
         pc.setRemoteDescription(
             new RTCSessionDescription({type: 'offer', sdp: offerSdp}),
             // success
             () => {
                 utils.createLocalSdp(pc, 'answer')
                     .then((sdp) => {
                         DEBUG('Local SDP: %s', sdp);
                         this._sendAnswer(sdp);
                     })
                     .catch((reason) => {
                         DEBUG(reason);
                         this._close();
                     });
             },
             // failure
             (error) => {
                 DEBUG('Error setting remote description: %s', error);
                 this._close();
             }
         );
     }
 
     _sendAttach() {
         const req = {
             sylkrtc: 'videoroom-ctl',
             session: this.conference.id,
             option: 'feed-attach',
             feed_attach: {
                 session: this.id,
                 publisher: this._publisherId
             }
         };
         DEBUG('Sending request: %o', req);
         this.conference._sendRequest(req, (error) => {
             if (error) {
                 DEBUG('Error attaching to participant %s: %s', this._publisherId, error);
             }
         });
     }
 
     _sendDetach() {
         const req = {
             sylkrtc: 'videoroom-ctl',
             session: this.conference.id,
             option: 'feed-detach',
             feed_detach: {
                 session: this.id
             }
         };
         DEBUG('Sending request: %o', req);
         this.conference._sendRequest(req, (error) => {
             if (error) {
                 DEBUG('Error detaching to participant %s: %s', this._publisherId, error);
             }
             this._close();
         });
     }
 
     _sendTrickle(candidate) {
         const req = {
             sylkrtc: 'videoroom-ctl',
             session: this.conference.id,
             option: 'trickle',
             trickle: {
                 session: this.id,
                 candidates: candidate !== null ? [candidate] : []
             }
         };
         this.conference._sendRequest(req, null);
     }
 
     _sendAnswer(sdp) {
         const req = {
             sylkrtc: 'videoroom-ctl',
             session: this.conference.id,
             option: 'feed-answer',
             feed_answer: {
                 session: this.id,
                 sdp: sdp
             }
         };
         this.conference._sendRequest(req, (error) => {
             if (error) {
                 DEBUG('Answer error: %s', error);
                 this._close();
             }
         });
     }
 
     _close() {
         DEBUG('Closing Participant RTCPeerConnection');
         if (this._pc !== null) {
             for (let stream of this._pc.getLocalStreams()) {
                 utils.closeMediaStream(stream);
             }
             for (let stream of this._pc.getRemoteStreams()) {
                 utils.closeMediaStream(stream);
             }
             this._pc.close();
             this._pc = null;
             this._setState(null);
         }
     }
 }
 
 
 class ConferenceCall extends EventEmitter {
     constructor(account) {
         super();
         this._account = account;
         this._id = null;
         this._pc = null;
         this._participants = new Map();
         this._terminated = false;
         this._state = null;
         this._localIdentity = new utils.Identity(account.id, account.displayName);
         this._remoteIdentity = null;
         this._pcConfig = null;  // saved on initialize, used later for subscriptions
     }
 
     get account() {
         return this._account;
     }
 
     get id() {
         return this._id;
     }
 
     get direction() {
         // make this object API compatible with `Call`
         return 'outgoing';
     }
 
     get state() {
         return this._state;
     }
 
     get localIdentity() {
         return this._localIdentity;
     }
 
     get remoteIdentity() {
         return this._remoteIdentity;
     }
 
     get participants() {
         return Array.from(this._participants.values());
     }
 
     getLocalStreams() {
         if (this._pc !== null) {
             return this._pc.getLocalStreams();
         } else {
             return [];
         }
     }
 
     getRemoteStreams() {
         let streams = [];
         for (let participant of this._participants) {
             streams = streams.contact(participant.streams);
         }
         return streams;
     }
 
     terminate() {
         if (this._terminated) {
             return;
         }
         DEBUG('Terminating conference');
         this._sendTerminate();
     }
 
     inviteParticipants(ps) {
         if (this._terminated) {
             return;
         }
         if (!Array.isArray(ps) || ps.length === 0) {
             return;
         }
         DEBUG('Inviting participants: %o', ps);
         const req = {
             sylkrtc: 'videoroom-ctl',
             session: this.id,
             option: 'invite-participants',
             invite_participants: {
                 participants: ps
             }
         };
         this._sendRequest(req, null);
     }
 
     // Private API
 
     _initialize(uri, options={}) {
         if (this._id !== null) {
             throw new Error('Already initialized');
         }
 
         if (uri.indexOf('@') === -1) {
             throw new Error('Invalid URI');
         }
 
         if (!options.localStream) {
             throw new Error('Missing localStream');
         }
 
-        this._id = uuid.v4();
+        this._id = uuidv4();
         this._remoteIdentity = new utils.Identity(uri);
 
         options = Object.assign({}, options);
         const pcConfig = options.pcConfig || {iceServers:[]};
         this._pcConfig = pcConfig;
         this._initialParticipants = options.initialParticipants || [];
         const offerOptions = options.offerOptions || {};
         // only send audio / video through the publisher connection
         offerOptions.offerToReceiveAudio = false;
         offerOptions.offerToReceiveVideo = false;
         delete offerOptions.mandatory;
 
         // Create the RTCPeerConnection
         this._pc = new RTCPeerConnection(pcConfig);
         this._pc.addEventListener('icecandidate', (event) => {
             if (event.candidate !== null) {
                 DEBUG('New ICE candidate %o', event.candidate);
             } else {
                 DEBUG('ICE candidate gathering finished');
             }
             this._sendTrickle(event.candidate);
         });
 
         this._pc.addStream(options.localStream);
         this.emit('localStreamAdded', options.localStream);
         DEBUG('Offer options: %o', offerOptions);
         utils.createLocalSdp(this._pc, 'offer', offerOptions)
             .then((sdp) => {
                 DEBUG('Local SDP: %s', sdp);
                 this._sendJoin(sdp);
             })
             .catch((reason) => {
                 this._localTerminate(reason);
             });
     }
 
     _handleEvent(message) {
         DEBUG('Conference event: %o', message);
         switch (message.event) {
             case 'state':
                 const oldState = this._state;
                 const newState = message.data.state;
                 this._state = newState;
                 let data = {};
                 let participant;
 
                 if (newState === 'accepted') {
                     let sdp = utils.mungeSdp(message.data.sdp);
                     DEBUG('Remote SDP: %s', sdp);
                     this._pc.setRemoteDescription(
                         new RTCSessionDescription({type: 'answer', sdp: sdp}),
                         // success
                         () => {
                             DEBUG('Conference accepted');
                             this.emit('stateChanged', oldState, newState, data);
                             if (this._initialParticipants.length > 0 ) {
                                 setTimeout(() => {
                                         this.inviteParticipants(this._initialParticipants);
                                 }, 50);
                             }
                         },
                         // failure
                         (error) => {
                             DEBUG('Error processing conference accept: %s', error);
                             this.terminate();
                         }
                     );
                 } else {
                     if (newState === 'terminated') {
                         data.reason = message.data.reason;
                         this._terminated = true;
                         this._close();
                     }
                     this.emit('stateChanged', oldState, newState, data);
                 }
                 break;
             case 'initial_publishers':
                 // this comes between 'accepted' and 'established' states
                 for (let p of message.data.publishers) {
                     if (!this._participants.has(p.id)) {
                         participant = new Participant(p.id, new utils.Identity(p.uri, p.display_name), this);
                         this._participants.set(participant.id, participant);
                     }
                 }
                 break;
             case 'publishers_joined':
                 for (let p of message.data.publishers) {
                     if (!this._participants.has(p.id)) {
                         DEBUG('Participant joined: %o', p);
                         participant = new Participant(p.id, new utils.Identity(p.uri, p.display_name), this);
                         this._participants.set(participant.id, participant);
                         this.emit('participantJoined', participant);
                     }
                 }
                 break;
             case 'publishers_left':
                 for (let pId of message.data.publishers) {
                     for (participant of this._participants.values()) {
                         if (pId === participant._publisherId) {
                             this._participants.delete(participant.id);
                             this.emit('participantLeft', participant);
                         }
                     }
                 }
                 break;
             case 'feed_attached':
                 participant = this._participants.get(message.data.subscription);
                 if (participant) {
                     participant._handleOffer(message.data.sdp);
                 }
                 break;
             case 'feed_established':
                 participant = this._participants.get(message.data.subscription);
                 if (participant) {
                     participant._setState('established');
                 }
                 break;
             default:
                 break;
         }
     }
 
     _sendJoin(sdp) {
         const req = {
             sylkrtc: 'videoroom-join',
             account: this.account.id,
             session: this.id,
             uri: this.remoteIdentity.uri,
             sdp: sdp
         };
         DEBUG('Sending request: %o', req);
         this._sendRequest(req, (error) => {
             if (error) {
                 this._localTerminate(error);
             }
         });
     }
 
     _sendTerminate() {
         const req = {
             sylkrtc: 'videoroom-terminate',
             session: this.id
         };
         this._sendRequest(req, (error) => {
             if (error) {
                 DEBUG('Error terminating conference: %s', error);
                 this._localTerminate(error);
             }
             this._terminated = true;
         });
         setTimeout(() => {
             if (!this._terminated) {
                 DEBUG('Timeout terminating call');
                 this._localTerminate('');
             }
             this._terminated = true;
         }, 150);
     }
 
     _sendTrickle(candidate) {
         const req = {
             sylkrtc: 'videoroom-ctl',
             session: this.id,
             option: 'trickle',
             trickle: {
                 candidates: candidate !== null ? [candidate] : []
             }
         };
         this._sendRequest(req, null);
     }
 
     _sendRequest(req, cb) {
         this._account._sendRequest(req, cb);
     }
 
     _close() {
         DEBUG('Closing RTCPeerConnection');
         if (this._pc !== null) {
             for (let stream of this._pc.getLocalStreams()) {
                 utils.closeMediaStream(stream);
             }
             for (let stream of this._pc.getRemoteStreams()) {
                 utils.closeMediaStream(stream);
             }
             this._pc.close();
             this._pc = null;
         }
         const participants = this.participants;
         this._participants = [];
         for (let p of participants) {
             p._close();
         }
     }
 
     _localTerminate(reason) {
         if (this._terminated) {
             return;
         }
         DEBUG(`Local terminate, reason: ${reason}`);
         this._account._confCalls.delete(this.id);
         this._terminated = true;
         const oldState = this._state;
         const newState = 'terminated';
         const data = {
             reason: reason.toString()
         };
         this._close();
         this.emit('stateChanged', oldState, newState, data);
     }
 
 }
 
 
 export { ConferenceCall };
diff --git a/lib/connection.js b/lib/connection.js
index cc3e8ea..a50ed26 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -1,323 +1,323 @@
 'use strict';
 
 import bowser from 'bowser';
 import debug from 'debug';
-import uuid from 'node-uuid';
+import uuidv4 from 'uuid/v4';
 
 import { EventEmitter } from 'events';
 import { setImmediate } from 'timers';
 import { w3cwebsocket as W3CWebSocket } from 'websocket';
 import { Account } from './account';
 
 const SYLKRTC_PROTO = 'sylkRTC-1';
 const DEBUG = debug('sylkrtc:Connection');
 
 const MSECS = 1000;
 const INITIAL_DELAY = 0.5 * MSECS;
 const MAX_DELAY = 64 * MSECS;
 
 // compute a string for our well-known platforms
 let platform;
 if (bowser.iphone) {
     platform = 'iPhone';
 } else if (bowser.ipad) {
     platform = 'iPad';
 } else if (bowser.ipod) {
     platform = 'iPod';
 } else if (bowser.android) {
     platform = 'Android';
 } else if (bowser.mac) {
     platform = 'macOS';
 } else if (bowser.linux) {
     platform = 'Linux';
 } else if (bowser.windows) {
     platform = 'Windows';
 } else {
     platform = 'Unknown';
 }
 if (bowser.osversion) {
     platform = `${platform} ${bowser.osversion}`;
 }
 let browser = bowser.name;
 if (bowser.version) {
     browser = `${browser} ${bowser.version}`;
 }
 
 const USER_AGENT = `SylkRTC (${browser} on ${platform})`;
 
 
 class Connection extends EventEmitter {
     constructor(options = {}) {
         if (!options.server) {
             throw new Error('\"server\" must be specified');
         }
         super();
         this._wsUri = options.server;
         this._sock = null;
         this._state = null;
         this._closed = false;
         this._timer = null;
         this._delay = INITIAL_DELAY;
         this._accounts = new Map();
         this._requests = new Map();
     }
 
     get state() {
         return this._state;
     }
 
     close() {
         if (this._closed) {
             return;
         }
         this._closed = true;
         if (this._timer) {
             clearTimeout(this._timer);
             this._timer = null;
         }
         if (this._sock) {
             this._sock.close();
             this._sock = null;
         } else {
             setImmediate(() => {
                 this._setState('closed');
             });
         }
     }
 
     addAccount(options = {}, cb = null) {
         if (typeof options.account !== 'string' || typeof options.password !== 'string') {
             throw new Error('Invalid options, \"account\" and \"password\" must be supplied');
         }
         if (this._accounts.has(options.account)) {
             throw new Error('Account already added');
         }
 
         const acc = new Account(options, this);
         // add it early to the set so we don't add it more than once, ever
         this._accounts.set(acc.id, acc);
 
         const req = {
             sylkrtc: 'account-add',
             account: acc.id,
             password: acc.password,
             display_name: acc.displayName,
             user_agent: USER_AGENT
         };
         this._sendRequest(req, (error) => {
             if (error) {
                 DEBUG('add_account error: %s', error);
                 this._accounts.delete(acc.id);
             }
             if (cb) {
                 cb(error, error ? null : acc);
             }
         });
 
     }
 
     removeAccount(account, cb=null) {
         const acc = this._accounts.get(account.id);
         if (account !== acc) {
             throw new Error('Unknown account');
         }
 
         // delete the account from the mapping, regardless of the result
         this._accounts.delete(account.id);
 
         const req = {
             sylkrtc: 'account-remove',
             account: acc.id
         };
         this._sendRequest(req, (error) => {
             if (error) {
                 DEBUG('remove_account error: %s', error);
             }
             if (cb) {
                 cb();
             }
         });
 
     }
 
     reconnect() {
         if (this._state === 'disconnected') {
             clearTimeout(this._timer);
             this._delay = INITIAL_DELAY;
             this._timer = setTimeout(() => {
                 this._connect();
             }, this._delay);
         }
     }
 
     // Private API
 
     _initialize() {
         if (this._sock !== null) {
             throw new Error('WebSocket already initialized');
         }
         if (this._timer !== null) {
             throw new Error('Initialize is in progress');
         }
 
         DEBUG('Initializing');
 
         if (process.browser) {
             window.addEventListener('beforeunload', () => {
                 if (this._sock !== null) {
                     const noop = function() {};
                     this._sock.onerror = noop;
                     this._sock.onmessage = noop;
                     this._sock.onclose = noop;
                     this._sock.close();
                 }
             });
         }
 
         this._timer = setTimeout(() => {
             this._connect();
         }, this._delay);
     }
 
     _connect() {
         DEBUG('WebSocket connecting');
         this._setState('connecting');
 
         this._sock = new W3CWebSocket(this._wsUri, SYLKRTC_PROTO);
         this._sock.onopen = () => {
             DEBUG('WebSocket connection open');
             this._onOpen();
         };
         this._sock.onerror = () => {
             DEBUG('WebSocket connection got error');
         };
         this._sock.onclose = (event) => {
             DEBUG('WebSocket connection closed: %d: (reason=\"%s\", clean=%s)', event.code, event.reason, event.wasClean);
             this._onClose();
         };
         this._sock.onmessage = (event) => {
             DEBUG('WebSocket received message: %o', event);
             this._onMessage(event);
         };
     }
 
     _sendRequest(req, cb) {
-        const transaction = uuid.v4();
+        const transaction = uuidv4();
         req.transaction = transaction;
         if (this._state !== 'ready') {
             setImmediate(() => {
                 cb(new Error('Connection is not ready'));
             });
             return;
         }
         this._requests.set(transaction, {req: req, cb: cb});
         this._sock.send(JSON.stringify(req));
     }
 
     _setState(newState) {
         DEBUG('Set state: %s -> %s', this._state, newState);
         const oldState = this._state;
         this._state = newState;
         this.emit('stateChanged', oldState, newState);
     }
 
     // WebSocket callbacks
 
     _onOpen() {
         clearTimeout(this._timer);
         this._timer = null;
         this._delay = INITIAL_DELAY;
         this._setState('connected');
     }
 
     _onClose() {
         this._sock = null;
         if (this._timer) {
             clearTimeout(this._timer);
             this._timer = null;
         }
 
         // remove all accounts, the server no longer has them anyway
         this._accounts.clear();
 
         this._setState('disconnected');
         if (!this._closed) {
             this._delay = this._delay * 2;
             if (this._delay > MAX_DELAY) {
                 this._delay = INITIAL_DELAY;
             }
             DEBUG('Retrying connection in %s seconds', this._delay / MSECS);
             this._timer = setTimeout(() => {
                 this._connect();
             }, this._delay);
         } else {
             this._setState('closed');
         }
     }
 
     _onMessage(event) {
         const message = JSON.parse(event.data);
         if (typeof message.sylkrtc === 'undefined') {
             DEBUG('Unrecognized message received');
             return;
         }
 
         DEBUG('Received \"%s\" message: %o', message.sylkrtc, message);
 
         if (message.sylkrtc === 'event') {
             DEBUG('Received event: \"%s\"', message.event);
             switch (message.event) {
                 case 'ready':
                     this._setState('ready');
                     break;
                 default:
                     break;
             }
         } else if (message.sylkrtc === 'account_event') {
             let acc = this._accounts.get(message.account);
             if (!acc) {
                 DEBUG('Account %s not found', message.account);
                 return;
             }
             acc._handleEvent(message);
         } else if (message.sylkrtc === 'session_event') {
             const sessionId = message.session;
             for (let acc of this._accounts.values()) {
                 let call = acc._calls.get(sessionId);
                 if (call) {
                     call._handleEvent(message);
                     break;
                 }
             }
         } else if (message.sylkrtc === 'videoroom_event') {
             const confId = message.session;
             for (let acc of this._accounts.values()) {
                  let confCall = acc._confCalls.get(confId);
                  if (confCall) {
                      confCall._handleEvent(message);
                      break;
                  }
             }
         } else if (message.sylkrtc === 'ack' || message.sylkrtc === 'error') {
             const transaction = message.transaction;
             const data = this._requests.get(transaction);
             if (!data) {
                 DEBUG('Could not find transaction %s', transaction);
                 return;
             }
             this._requests.delete(transaction);
             DEBUG('Received \"%s\" for request: %o', message.sylkrtc, data.req);
             if (data.cb) {
                 if (message.sylkrtc === 'ack') {
                     data.cb(null);
                 } else {
                     data.cb(new Error(message.error));
                 }
             }
         }
     }
 
 }
 
 
 export { Connection };
diff --git a/package.json b/package.json
index 9498d47..2649be5 100644
--- a/package.json
+++ b/package.json
@@ -1,49 +1,49 @@
 {
   "name": "sylkrtc",
   "version": "0.9.0",
   "main": "lib/sylkrtc.js",
   "description": "SylkServer WebRTC Gateway client library",
   "repository": {
     "type": "git",
     "url": "git://github.com/AGProjects/sylkrtc.git"
   },
   "keywords": [],
   "author": "AG Projects",
   "contributors": [
     "Tijmen de Mes <tijmen@ag-projects.com>",
     "Saúl Ibarra Corretgé <saul@ag-projects.com>"
   ],
   "license": "MIT",
   "readmeFilename": "README.md",
   "browserify": {
     "transform": [
       "babelify"
     ]
   },
   "dependencies": {
     "attachmediastream": "^1.4.2",
     "blueimp-md5": "^2.3.0",
     "bowser": "^1.4.1",
     "debug": "^2.2.0",
-    "node-uuid": "^1.4.7",
     "sdp-transform": "^1.6.2",
+    "uuid": "^3.1.0",
     "webrtc-adapter": "^2.0.7",
     "websocket": "^1.0.23"
   },
   "devDependencies": {
     "babel-preset-es2015": "^6.9.0",
     "babelify": "^7.3.0",
     "browserify": "^13.0.1",
     "gulp": "git+https://github.com/gulpjs/gulp.git#4.0",
     "gulp-filelog": "^0.4.1",
     "gulp-header": "^1.8.7",
     "gulp-jshint": "^2.0.1",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-uglify": "^1.5.4",
     "gulp-util": "^3.0.7",
     "jshint": "^2.9.4",
     "jshint-stylish": "^2.2.0",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0"
   }
 }