diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index bb0933af5..18470668f 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -320,6 +320,7 @@ All definitions files include a header with the author and editors, so at some p
 * [SignalR](http://www.asp.net/signalr) (by [Boris Yankov](https://github.com/borisyankov))
 * [simple-cw-node](https://github.com/astronaughts/simple-cw-node) (by [vvakame](https://github.com/vvakame))
 * [Sinon](http://sinonjs.org/) (by [William Sears](https://github.com/mrbigdog2u))
+* [SIPml](http://sipml5.org/) (by [Adriaan Groenenboom](https://github.com/chookies))
 * [sjcl](http://crypto.stanford.edu/sjcl/) (by [Eugene Chernyshov](https://github.com/Evgenus))
 * [SlickGrid](https://github.com/mleibman/SlickGrid) (by [Josh Baldwin](https://github.com/jbaldwin))
 * [smoothie](https://github.com/joewalnes/smoothie) (by [Mike H. Hawley](https://github.com/mikehhawley) and [Drew Noakes](https://drewnoakes.com))
diff --git a/sipml/sipml-test.ts b/sipml/sipml-test.ts
new file mode 100644
index 000000000..5fed26fc6
--- /dev/null
+++ b/sipml/sipml-test.ts
@@ -0,0 +1,169 @@
+/// <reference path="sipml.d.ts" />
+
+/* Code borrowed from http://sipml5.org/docgen/index.html?svn=224 */
+
+var acceptMessage = (e: any)=> {
+    e.newSession.accept(); // e.newSession.reject(); to reject the message
+    console.info('SMS-content = ' + e.getContentString() + ' and SMS-content-type = ' + e.getContentType());
+};
+var acceptCall = (e:any)=> {
+    e.newSession.accept(); // e.newSession.reject() to reject the call
+};
+
+ /* Initialize the engine */
+var readyCallback = (e:any)=> {
+    createSipStack(); // see next section
+};
+var errorCallback = (e:any)=> {
+    console.error('Failed to initialize the engine: ' + e.message);
+}
+SIPml.init(readyCallback, errorCallback);
+
+/* Create a SIP stack */
+var sipStack: SIPml.Stack;
+var eventsListener = (e:any)=> {
+    if(e.type == 'started'){
+        login();
+    }
+    else if(e.type == 'i_new_message'){ // incoming new SIP MESSAGE (SMS-like)
+        acceptMessage(e);
+    }
+    else if(e.type == 'i_new_call'){ // incoming audio/video call
+        acceptCall(e);
+    }
+}
+
+function createSipStack(){
+    sipStack = new SIPml.Stack('blaat');
+    sipStack = new SIPml.Stack({
+            realm: 'example.org', // mandatory: domain name
+            impi: 'bob', // mandatory: authorization name (IMS Private Identity)
+            impu: 'sip:bob@example.org', // mandatory: valid SIP Uri (IMS Public Identity)
+            password: 'mysecret', // optional
+            display_name: 'Bob legend', // optional
+            websocket_proxy_url: 'wss://sipml5.org:10062', // optional
+            outbound_proxy_url: 'udp://example.org:5060', // optional
+            enable_rtcweb_breaker: false, // optional
+            events_listener: { events: '*', listener: eventsListener }, // optional: '*' means all events
+            sip_headers: [ // optional
+                    { name: 'User-Agent', value: 'IM-client/OMA1.0 sipML5-v1.0.0.0' },
+                    { name: 'Organization', value: 'Doubango Telecom' }
+            ]
+        }
+    );
+}
+sipStack.start();
+
+/* Register/login */
+var registerSession: SIPml.Session.Registration;
+var eventsListener = (e:any)=>{
+    console.info('session event = ' + e.type);
+    if(e.type == 'connected' && e.session == registerSession){
+        makeCall();
+        sendMessage();
+        publishPresence();
+        subscribePresence('johndoe'); // watch johndoe's presence status change
+    }
+}
+var login = ()=>{
+    registerSession = <SIPml.Session.Registration>sipStack.newSession('register', {
+        events_listener: { events: '*', listener: eventsListener } // optional: '*' means all events
+    });
+    registerSession.register();
+}
+
+/* Making/receiving audio/video call */
+var callSession: SIPml.Session.Call;
+var eventsListener = (e:any)=>{
+    console.info('session event = ' + e.type);
+}
+var makeCall = ()=>{
+    callSession = <SIPml.Session.Call>sipStack.newSession('call-audiovideo', {
+        video_local: document.getElementById('video-local'),
+        video_remote: document.getElementById('video-remote'),
+        audio_remote: document.getElementById('audio-remote'),
+        events_listener: { events: '*', listener: eventsListener } // optional: '*' means all events
+    });
+    callSession.call('johndoe');
+}
+var acceptCall = (e:any)=>{
+    e.newSession.accept(); // e.newSession.reject() to reject the call
+}
+
+/* Send/receive SIP MESSAGE (SMS-like) */
+var messageSession: SIPml.Session.Message;
+var eventsListener = (e:any)=>{
+    console.info('session event = ' + e.type);
+}
+var sendMessage = ()=>{
+    messageSession = <SIPml.Session.Message>sipStack.newSession('message', {
+        events_listener: { events: '*', listener: eventsListener } // optional: '*' means all events
+    });
+    messageSession.send('johndoe', 'Pêche à la moule', 'text/plain;charset=utf-8');
+}
+
+/* Publish presence status */
+var publishSession: SIPml.Session.Publish;
+var eventsListener = (e:any)=>{
+    console.info('session event = ' + e.type);
+}
+var publishPresence = ()=>{
+    publishSession = <SIPml.Session.Publish>sipStack.newSession('publish', {
+        events_listener: { events: '*', listener: eventsListener } // optional: '*' means all events
+    });                
+    var contentType = 'application/pidf+xml';
+    var content = '<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n' +
+                    '<presence xmlns=\"urn:ietf:params:xml:ns:pidf\"\n' +
+                        ' xmlns:im=\"urn:ietf:params:xml:ns:pidf:im\"' +
+                      ' entity=\"sip:bob@example.com\">\n' +
+                        '<tuple id=\"s8794\">\n' +
+                        '<status>\n'+
+                        '   <basic>open</basic>\n' +
+                        '   <im:im>away</im:im>\n' +
+                        '</status>\n' +
+                        '<contact priority=\"0.8\">tel:+33600000000</contact>\n' +
+                        '<note  xml:lang=\"fr\">Bonjour de Paris :)</note>\n' +
+                        '</tuple>\n' +
+                    '</presence>';
+
+    // send the PUBLISH request
+    publishSession.publish(content, contentType,{
+        expires: 200,
+        sip_caps: [
+                        { name: '+g.oma.sip-im' },
+                        { name: '+sip.ice' },
+                        { name: 'language', value: '\"en,fr\"' }
+                  ],
+        sip_headers: [
+                        { name: 'Event', value: 'presence' },
+                        { name: 'Organization', value: 'Doubango Telecom' }
+                     ]
+    });
+}
+
+/* Subscribe for presence status */
+var subscribeSession: SIPml.Session.Subscribe;
+var eventsListener = (e:any)=>{
+    console.info('session event = ' + e.type);
+    if(e.type == 'i_notify'){
+        console.info('NOTIFY content = ' + e.getContentString());
+        console.info('NOTIFY content-type = ' + e.getContentType());
+    }
+}
+var subscribePresence = (to:string)=>{
+    subscribeSession = <SIPml.Session.Subscribe>sipStack.newSession('subscribe', {
+                expires: 200,
+                events_listener: { events: '*', listener: eventsListener },
+                sip_headers: [
+                              { name: 'Event', value: 'presence' }, // only notify for 'presence' events
+                              { name: 'Accept', value: 'application/pidf+xml' } // supported content types (COMMA-sparated)
+                    ],
+                sip_caps: [
+                            { name: '+g.oma.sip-im', value: null },
+                            { name: '+audio', value: null },
+                            { name: 'language', value: '\"en,fr\"' }
+                    ]
+            });
+    // start watching for entity's presence status (You may track event type 'connected' to be sure that the request has been accepted by the server)
+    subscribeSession.subscribe(to);
+}
diff --git a/sipml/sipml.d.ts b/sipml/sipml.d.ts
index 265f7650a..a4fe32784 100644
--- a/sipml/sipml.d.ts
+++ b/sipml/sipml.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for SIPml5
 // Project: http://sipml5.org/
-// Docgen: http://sipml5.org/docgen/symbols/SIPml.html
-// Definitions by: Chookies (A. Groenenboom): https://github.com/chookies
+// Definitions by: A. Groenenboom <https://github.com/chookies>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module SIPml {
@@ -16,8 +15,8 @@ declare module SIPml {
   }
 
   class EventTarget {
-    public addEventListener(type: any, listener: any);
-    public removeEventListener(type: any);
+    public addEventListener(type: any, listener: Function): void;
+    public removeEventListener(type: any): void;
   }
 
   class Session {
@@ -26,7 +25,7 @@ declare module SIPml {
     public getRemoteFriendlyName(): string;
     public getRemoteUri(): string;
     public reject(configuration?: Session.Configuration): number;
-    public setConfiguration(configuration?: Session.Configuration);
+    public setConfiguration(configuration?: Session.Configuration): void;
   }
 
   export module Session {
@@ -60,19 +59,19 @@ declare module SIPml {
       public getTransferDestinationFriendlyName(): string;
     }
 
-    class Message {
+    class Message extends Session {
       public send(to: string, content?: any, contentType?: string, configuration?: Session.Configuration): number;
     }
 
     class Publish extends Session {
       public publish(content?: any, contentType?: string, configuration?: Session.Configuration): number;
 
-      public unpublish(configuration?: Session.Configuration);
+      public unpublish(configuration?: Session.Configuration): void;
     }
 
     class Registration extends Session {
-      public register(configuration?: Session.Configuration);
-      public unregister(configuration?: Session.Configuration);
+      public register(configuration?: Session.Configuration): void;
+      public unregister(configuration?: Session.Configuration): void;
     }
 
     class Subscribe extends Session {
@@ -83,8 +82,8 @@ declare module SIPml {
 
   class Stack extends EventTarget {
     public constructor(configuration?: Stack.Configuration);
-    public setConfiguration(configuration: Stack.Configuration);
-    public newSession(type: string, configuration: Stack.Configuration);
+    public setConfiguration(configuration: Stack.Configuration): number;
+    public newSession(type: string, configuration: Stack.Configuration): any;
     public start(): number;
     public stop(timeout: number): number;
   }
@@ -126,7 +125,7 @@ declare module SIPml {
 
   function haveMediaStream(): boolean;
 
-  function init(readyCallback?: (e:any) => any, errorCallback?: (e:any) => any);
+  function init(readyCallback?: (e:any) => any, errorCallback?: (e:any) => any): boolean;
 
   function isInitialized(): boolean;
 
@@ -144,7 +143,7 @@ declare module SIPml {
 
   function isWebSocketSupported(): boolean;
 
-  function setDebugLevel(level: string);
+  function setDebugLevel(level: string): void;
 
-  function setWebRtcType(type: string);
+  function setWebRtcType(type: string): boolean;
 }