diff --git a/HISTORY.md b/HISTORY.md
index e7b6fa8b..db27fbe1 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -4,11 +4,11 @@
 
 ## 6.0.7 -> 6.0.8
 
-- Add `iris.UseTemplateFunc(functionName string, function interface{})`. You could always set custom template funcs by using each of [template engine's](https://github.com/kataras/go-template) configuration but this function will help newcomers to start creating their custom template funcs. 
+- Add `iris.UseTemplateFunc(functionName string, function interface{})`. You could always set custom template funcs by using each of [template engine's](https://github.com/kataras/go-template) configuration but this function will help newcomers to start creating their custom template funcs.
 
 Example:
 
--  https://github.com/iris-contrib/examples/tree/master/template_funcmap
+-  https://github.com/iris-contrib/examples/tree/master/template_engines/template_funcmap
 
 ## 6.0.6 -> 6.0.7
 
diff --git a/README.md b/README.md
index b1da2095..73b6e6ae 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ Quick Start
 -----------
 
 ```bash
-go get -u github.com/kataras/iris
+go get -u github.com/kataras/iris/iris
 ```
 
 ```sh
@@ -119,7 +119,7 @@ func main(){
 
   })
 
-  iris.Listen("localhost:5900")
+  iris.Listen(":6000")
 }
 
 ```
@@ -127,8 +127,12 @@ func main(){
 ```sh
 $ go run hellojson.go
 ```
+> TIP #1> $ iris run main.go to enable hot-reload on .go source code changes.
 
-Open your browser or any other http client at http://localhost:5700/api/user/42.
+> TIP #2> iris.Config.IsDevelopment = true to monitor the changes you make in the templates. 
+
+
+Open your browser or any other http client at http://localhost:6000/api/user/42.
 
 
 ### New