diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..ad7b038
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: node_js
+node_js :
+- "iojs"
+deploy:
+  provider: npm
+  email: eduardo@comakai.com
+  api_key:
+    secure: JX1zgdfsP3rwISjl2mn6LNFOwNYcy2XIuL1mHXhAllDE5utvvaum8/zt/PWuBY7qlocGN8NZfjDsWc3PlDiezs9o0JZ0y0ipBgcPLPJJqbXc6U5EIVAUwnOMs7HorF1yz4S5T4GfBWwWfhFPr3setSHmRDTKyjmUBUqnvUj9Pq8=
+  on:
+    tags: true
+    repo: coma/react-socket
\ No newline at end of file
diff --git a/README.md b/README.md
index 23e96c7..2b9f1fe 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,72 @@
-# react-socket
-A React wrapper for socket.io
+react-socket
+============
+
+[![Build Status](https://travis-ci.org/coma/react-socket.png?branch=master)](https://travis-ci.org/coma/react-socket)
+[![Dependency Status](https://david-dm.org/coma/react-socket.png)](http://david-dm.org/coma/react-socket)
+[![NPM version](https://badge.fury.io/js/react-socket.png)](http://badge.fury.io/js/react-socket)
+
+A React wrapper for Socket.IO
+
+Usage
+-----
+
+Just mount a socket on one of your components:
+
+```javascript
+var React  = require('react'),
+	Socket = require('react-socket').Socket;
+
+module.exports = module.exports = React.createClass({
+	render: function () {
+
+		return (
+			<div>
+				<Socket url="your-socket-endpoint:port?"/>
+			</div>
+		);
+	}
+});
+```
+
+and then start listening to it:
+
+```javascript
+var React       = require('react'),
+	SocketEvent = require('react-socket').Event;
+
+module.exports = module.exports = React.createClass({
+	onSocketMessage: function (message) {
+
+		...
+	},
+	render: function () {
+
+		return (
+			<div>
+				<SocketEvent name="your-socket-event" callback={ this.onSocketMessage }/>
+			</div>
+		);
+	}
+});
+```
+
+Use the name property to mount more than one socket:
+
+```javascript
+var React  = require('react'),
+	Socket = require('react-socket');
+
+module.exports = module.exports = React.createClass({
+	render: function () {
+
+		return (
+			<div>
+				<Socket.Socket url="/a" name="a"/>
+				<Socket.Socket url="/b" name="b"/>
+				<Socket.Event socket="a" name="foo" callback={ this.onA }/>
+				<Socket.Event socket="b" name="foo" callback={ this.onB }/>
+			</div>
+		);
+	}
+});
+```
\ No newline at end of file
diff --git a/package.json b/package.json
index b44a51e..89fed51 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "homepage"       : "https://github.com/coma/react-socket",
     "repository"     : "https://github.com/coma/react-socket",
     "main"           : "./index.js",
-    "version"        : "0.0.0",
+    "version"        : "0.1.0",
     "license"        : "MIT",
     "private"        : false,
     "authors"        : [