diff --git a/.travis.yml b/.travis.yml
index cc1e38f2..b8f0b07b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ go:
 # - go1.8 works of course but
 # we must encourage users to update to the latest go version,
 # so examples are running on go 1.9 mode.
+  - go1.9
   - tip
 go_import_path: github.com/kataras/iris
 install:
diff --git a/README.md b/README.md
index d2763007..f9480eda 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-<!-- # ![Logo created by @santoshanand](logo_white_35_24.png) Iris 
--->
-<p align="center">
+# ![Logo created by @santoshanand](logo_white_35_24.png) Iris 
+
+<!-- <p align="center">
 <img src="iris_the_new_machine.gif">
-</p>
+</p> -->
 
 Iris is a fast, simple and efficient micro web framework for Go. It provides a beautifully expressive and easy to use foundation for your next website, API, or distributed app.
 
@@ -26,6 +26,7 @@ Iris may have reached version 8, but we're not stopping there. We have many feat
 [![report card](https://img.shields.io/badge/report%20card-a%2B-ff3333.svg?style=flat-square)](http://goreportcard.com/report/kataras/iris)
 [![github issues](https://img.shields.io/github/issues/kataras/iris.svg?style=flat-square)](https://github.com/kataras/iris/issues?q=is%3Aopen+is%3Aissue)
 [![github closed issues](https://img.shields.io/github/issues-closed-raw/kataras/iris.svg?style=flat-square)](https://github.com/kataras/iris/issues?q=is%3Aissue+is%3Aclosed)
+[![release](https://img.shields.io/github/release/kataras/iris.svg?style=flat-square)](https://github.com/kataras/iris/releases)
 [![view examples](https://img.shields.io/badge/learn%20by-examples-0077b3.svg?style=flat-square)](https://github.com/kataras/iris/tree/master/_examples)
 [![chat](https://img.shields.io/badge/community-%20chat-00BCD4.svg?style=flat-square)](https://kataras.rocket.chat/channel/iris)
 
diff --git a/_examples/websocket/chat/websockets.html b/_examples/websocket/chat/websockets.html
index 4f0cae63..0e1a7c36 100644
--- a/_examples/websocket/chat/websockets.html
+++ b/_examples/websocket/chat/websockets.html
@@ -3,11 +3,16 @@
 <pre id="output"></pre>
 <script src="/iris-ws.js"></script>
 <script>
+	var scheme = document.location.protocol == "https:" ? "wss" : "ws";
+	var port = document.location.port ? (":" + document.location.port) : "";
+	// see app.Get("/echo", ws.Handler()) on main.go
+	var wsURL = scheme + "://" + document.location.hostname + port+"/echo"; 
+
 	var input = document.getElementById("input");
 	var output = document.getElementById("output");
 
 	// Ws comes from the auto-served '/iris-ws.js'
-	var socket = new Ws("ws://localhost:8080/echo");
+	var socket = new Ws(wsURL)
 	socket.OnConnect(function () {
 		output.innerHTML += "Status: Connected\n";
 	});
@@ -22,7 +27,7 @@
 	});
 
 	function send() {
-		addMessage("Me: "+input.value) // write ourselves
+		addMessage("Me: " + input.value) // write ourselves
 		socket.Emit("chat", input.value);// send chat event data to the websocket server
 		input.value = ""; // clear the input
 	}
@@ -30,4 +35,5 @@
 	function addMessage(msg) {
 		output.innerHTML += msg + "\n";
 	}
-</script>
+
+</script>
\ No newline at end of file
diff --git a/core/router/api_builder.go b/core/router/api_builder.go
index fc7dff13..48c0587c 100644
--- a/core/router/api_builder.go
+++ b/core/router/api_builder.go
@@ -783,8 +783,7 @@ func (api *APIBuilder) StaticWeb(requestPath string, systemPath string) *Route {
 		}
 	}
 
-	requestPath = joinPath(fullpath, WildcardParam(paramName))
-	// requestPath = fullpath + "/{file:path}"
+	requestPath = joinPath(requestPath, WildcardParam(paramName))
 	return api.registerResourceRoute(requestPath, handler)
 }
 
diff --git a/websocket/emitter.go b/websocket/emitter.go
index d77be364..5827b24d 100644
--- a/websocket/emitter.go
+++ b/websocket/emitter.go
@@ -34,10 +34,6 @@ func (e *emitter) EmitMessage(nativeMessage []byte) error {
 }
 
 func (e *emitter) Emit(event string, data interface{}) error {
-	if e.conn.server.rooms[e.to] == nil {
-		return nil
-	}
-
 	message, err := websocketMessageSerialize(event, data)
 	if err != nil {
 		return err