diff --git a/README.md b/README.md
index bafbcda..c560db2 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,15 @@
[//]: https://www.iconfinder.com/icons/383207/doc_tag_icon#size=64
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

[](https://travis-ci.org/crossroadlabs/Express)
@@ -30,10 +18,20 @@

[](https://raw.githubusercontent.com/crossroadlabs/Express/master/LICENSE)
[](https://github.com/crossroadlabs/Express/releases)
+
+
+Being [perfectionists](http://www.crossroadlabs.xyz), we took the best from what we think is the best: power of [Play Framework](https://www.playframework.com/) and simplicity of [Express.js](http://expressjs.com/)
-### Being [perfectionists](http://www.crossroadlabs.xyz), we took the best from what we think is the best: power of [Play Framework](https://www.playframework.com/) and simplicity of [Express.js](http://expressjs.com/)
+Express is an asynchronous, simple, powerful, yet unopinionated web application server written in Swift.
-#### Express is an asynchronous, simple, powerful, yet unopinionated web application server written in Swift
+
+
+
+
+
+
+
+
## Getting started
@@ -72,7 +70,7 @@ Test it in the browser: [http://localhost:9999/myecho?message=Hello](http://loca
[//]: # (Icons are here: https://www.iconfinder.com/icons/395228/linux_tox_icon#size=16)
-### [OS X ](http://www.apple.com/osx/)
+#### OS X
##### First install the following components (if you have not yet):
@@ -87,7 +85,7 @@ brew tap crossroadlabs/tap
brew install swift-express
```
-#### [Linux ](http://www.linux.org/)
+#### Linux
##### For instructions on how to get [Express](http://swiftexpress.io/) installed on Linux, please, refer to the [installation section](./doc/gettingstarted/installing.md#linux-) in the [ducumentation](./doc/index.md).
@@ -130,15 +128,15 @@ it's a purely asyncronous function that returns future. It would be really nice
app.get("/factorial/:num(\\d+)") { request -> Future, AnyError> in
// get the number from the url
let num = request.params["num"].flatMap{Double($0)}.getOrElse(0)
-
+
// get the factorial Future. Returns immediately - non-blocking
let factorial = calcFactorial(num)
-
+
//map the result of future to Express Action
let future = factorial.map { fac in
Action.ok(String(fac))
}
-
+
//return the future
return future
}
@@ -195,7 +193,7 @@ app.post("/api/user") { request in
let response =
["status": "ok",
"description": "User with username '" + username + "' created succesfully"]
-
+
//render disctionary as json (remember the one we've registered above?)
return Action.render(JsonView.name, context: response)
}
diff --git a/logo-full.png b/logo-full.png
index a3a2bb3..f3bd7b4 100644
Binary files a/logo-full.png and b/logo-full.png differ