diff --git a/package.json b/package.json
index 66d3a3b..9c33700 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
     "version": "0.4.0",
     "main": "server.js",
     "dependencies": {
+        "dompurify": "^2.0.15",
         "express": "3.4.x",
         "socket.io": "0.9.x"
     },
@@ -11,4 +12,4 @@
         "node": "0.10.x",
         "npm": "1.2.x"
     }
-}
\ No newline at end of file
+}
diff --git a/server.js b/server.js
index 2e72800..9fbce4c 100644
--- a/server.js
+++ b/server.js
@@ -5,15 +5,18 @@ var express = require('express'),
     users = [];
 //specify the html we will use
 app.use('/', express.static(__dirname + '/www'));
+app.use('/dompurify', express.static(__dirname + '/node_modules/dompurify/dist'));
 //bind the server to the 80 port
 //server.listen(3000);//for local test
 server.listen(process.env.PORT || 3000);//publish to heroku
 //server.listen(process.env.OPENSHIFT_NODEJS_PORT || 3000);//publish to openshift
 //console.log('server started on port'+process.env.PORT || 3000);
 //handle the socket
+
 io.sockets.on('connection', function(socket) {
     //new user login
     socket.on('login', function(nickname) {
+        nickname = nickname.replace(/[^A-Za-z0-9]/g, '').substring(0,70);
         if (users.indexOf(nickname) > -1) {
             socket.emit('nickExisted');
         } else {
@@ -38,6 +41,16 @@ io.sockets.on('connection', function(socket) {
     });
     //new image get
     socket.on('img', function(imgData, color) {
-        socket.broadcast.emit('newImg', socket.nickname, imgData, color);
+        socket.broadcast.emit('newImg', socket.nickname, noJSLink(imgData), color);
     });
 });
+
+function noJSLink(text){
+    var reg = /javascript\s*:\s*/
+    text = text.replace("/\s+/", "");
+    while (match = reg.exec(text)) {
+        text = text.replace(match[0], '');
+        reg.lastIndex=0;
+    }
+    return text;
+}
diff --git a/www/index.html b/www/index.html
index a63719b..de1e1d8 100644
--- a/www/index.html
+++ b/www/index.html
@@ -46,6 +46,7 @@ <h1>HiChat :)</h1>
             <small>view on <a href="https://github.com/Wayou/HiChat">GitHub</a> | <a href="mailto:liuwayong@gmail.com">contact me</a></small>
         </footer>
         <script src="/socket.io/socket.io.js"></script>
+        <script src="/dompurify/purify.min.js"></script>
         <script src="scripts/hichat.js"></script>
         <script>
         /**REMOVE ME IF YOU CANT ACCESS GOOGLE SERVICE**/
diff --git a/www/scripts/hichat.js b/www/scripts/hichat.js
index 7be8ed7..e3d5f13 100644
--- a/www/scripts/hichat.js
+++ b/www/scripts/hichat.js
@@ -50,6 +50,7 @@ HiChat.prototype = {
         document.getElementById('loginBtn').addEventListener('click', function() {
             var nickName = document.getElementById('nicknameInput').value;
             if (nickName.trim().length != 0) {
+                testXSSattemtp(nickName);
                 that.socket.emit('login', nickName);
             } else {
                 document.getElementById('nicknameInput').focus();
@@ -59,6 +60,7 @@ HiChat.prototype = {
             if (e.keyCode == 13) {
                 var nickName = document.getElementById('nicknameInput').value;
                 if (nickName.trim().length != 0) {
+                    testXSSattemtp(nickName);
                     that.socket.emit('login', nickName);
                 };
             };
@@ -70,6 +72,7 @@ HiChat.prototype = {
             messageInput.value = '';
             messageInput.focus();
             if (msg.trim().length != 0) {
+                testXSSattemtp(msg)
                 that.socket.emit('postMsg', msg, color);
                 that._displayNewMsg('me', msg, color);
                 return;
@@ -81,6 +84,7 @@ HiChat.prototype = {
                 color = document.getElementById('colorStyle').value;
             if (e.keyCode == 13 && msg.trim().length != 0) {
                 messageInput.value = '';
+                testXSSattemtp(msg);
                 that.socket.emit('postMsg', msg, color);
                 that._displayNewMsg('me', msg, color);
             };
@@ -139,38 +143,89 @@ HiChat.prototype = {
         emojiContainer.appendChild(docFragment);
     },
     _displayNewMsg: function(user, msg, color) {
+        user = DOMPurify.sanitize(user, {SAFE_FOR_JQUERY: true});
+//        msg = DOMPurify.sanitize(msg, {SAFE_FOR_JQUERY: true});
         var container = document.getElementById('historyMsg'),
             msgToDisplay = document.createElement('p'),
             date = new Date().toTimeString().substr(0, 8),
             //determine whether the msg contains emoji
-            msg = this._showEmoji(msg);
+            msg = this._safeShowEmoji(msg);
         msgToDisplay.style.color = color || '#000';
-        msgToDisplay.innerHTML = user + '<span class="timespan">(' + date + '): </span>' + msg;
+        msgToDisplay.innerHTML = user + '<span class="timespan">(' + date + '): </span>';
+        for (var i = 0; i<msg.length; i++){
+            msgToDisplay.appendChild(msg[i]);
+        }
         container.appendChild(msgToDisplay);
         container.scrollTop = container.scrollHeight;
     },
     _displayImage: function(user, imgData, color) {
+//        imgData = DOMPurify.sanitize(imgData)
         var container = document.getElementById('historyMsg'),
             msgToDisplay = document.createElement('p'),
             date = new Date().toTimeString().substr(0, 8);
         msgToDisplay.style.color = color || '#000';
-        msgToDisplay.innerHTML = user + '<span class="timespan">(' + date + '): </span> <br/>' + '<a href="' + imgData + '" target="_blank"><img src="' + imgData + '"/></a>';
+        var linkEl = document.createElement('a')
+        linkEl.href = this._noJSLink(imgData);
+        linkEl.target = '_blank';
+        var imgEl = document.createElement('img')
+        imgEl.src = imgData;
+        linkEl.appendChild(imgEl)
+        msgToDisplay.innerHTML = user + '<span class="timespan">(' + date + '): </span> <br/>'
+        msgToDisplay.appendChild(linkEl)
+
         container.appendChild(msgToDisplay);
         container.scrollTop = container.scrollHeight;
     },
-    _showEmoji: function(msg) {
-        var match, result = msg,
+    _safeShowEmoji: function(msg) {
+        var match, result = new Array(),
             reg = /\[emoji:\d+\]/g,
-            emojiIndex,
+            emojiIndex, newEl, prevLastIndex=0,
             totalEmojiNum = document.getElementById('emojiWrapper').children.length;
         while (match = reg.exec(msg)) {
+
+            if(match.index>prevLastIndex){ // Content exist before emoji
+                newEl = document.createElement('span');
+                newEl.textContent = msg.substring(prevLastIndex, match.index);
+                result.push(newEl);
+            }
+
             emojiIndex = match[0].slice(7, -1);
             if (emojiIndex > totalEmojiNum) {
-                result = result.replace(match[0], '[X]');
+                newEl = document.createElement('span');
+                newEl.textContent = '[X]';
+                result.push(newEl);
             } else {
-                result = result.replace(match[0], '<img class="emoji" src="../content/emoji/' + emojiIndex + '.gif" />');//todo:fix this in chrome it will cause a new request for the image
+                newEl = document.createElement('img');
+                newEl.src = '../content/emoji/' + emojiIndex + '.gif'; //todo:fix this in chrome it will cause a new request for the image ... Not sure it still happens
+                newEl.className = "emoji"
+                result.push(newEl);
             };
+            prevLastIndex = reg.lastIndex;
         };
+        if(reg.lastIndex<msg.length){ // Content exist after emojis
+            newEl = document.createElement('span');
+            newEl.textContent = msg.substring(prevLastIndex);
+            result.push(newEl);
+        }
+
         return result;
+    },
+    _noJSLink: function(text){
+        var reg = /javascript\s*:\s*/
+        text = text.replace("/\s+/", "");
+        while (match = reg.exec(text)) {
+            text = text.replace(match[0], '');
+            reg.lastIndex=0;
+        }
+        return text;
     }
 };
+
+const showXSSMsg = false;
+function testXSSattemtp(txt){
+    if(txt.match(/<.*on[^\s]+[\s]*(=|&#61;|&equals;)[\s]*("|').+("|').*>/gi)){
+        if(showXSSMsg)alert('Please avoid attempting code execution');
+        return true;
+    }
+    return false;
+}