diff --git a/frameworks/Rust/actix/setup_diesel.sh b/frameworks/Rust/actix/setup_diesel.sh
diff --git a/frameworks/Rust/actix/setup_pg.sh b/frameworks/Rust/actix/setup_pg.sh
diff --git a/frameworks/Rust/hyper/benchmark_config.json b/frameworks/Rust/hyper/benchmark_config.json
@@ -2,7 +2,6 @@
  "framework": "hyper",
  "tests": [{
    "default": {
-      "setup_file": "setup",
      "json_url": "/json",
      "plaintext_url": "/plaintext", 
      "port": 8080,
diff --git a/frameworks/Rust/hyper/hyper.dockerfile b/frameworks/Rust/hyper/hyper.dockerfile
@@ -0,0 +1,8 @@
+FROM tfb/rust:latest
+
+COPY ./ ./
+
+RUN cargo clean
+RUN RUSTFLAGS="-C target-cpu=native" cargo build --release
+
+CMD ./target/release/hello
diff --git a/frameworks/Rust/hyper/setup.sh b/frameworks/Rust/hyper/setup.sh
diff --git a/frameworks/Rust/iron/benchmark_config.json b/frameworks/Rust/iron/benchmark_config.json
@@ -2,7 +2,6 @@
  "framework": "iron",
  "tests": [{
    "default": {
-      "setup_file": "setup",
      "json_url": "/json",
      "db_url": "/db",
      "fortune_url": "/fortune",
diff --git a/frameworks/Rust/iron/iron.dockerfile b/frameworks/Rust/iron/iron.dockerfile
@@ -0,0 +1,7 @@
+FROM tfb/rust:latest
+
+COPY ./ ./
+
+RUN cargo clean
+RUN RUSTFLAGS="-C target-cpu=native" cargo build --release
+CMD ./target/release/iron
diff --git a/frameworks/Rust/iron/setup.sh b/frameworks/Rust/iron/setup.sh
diff --git a/frameworks/Rust/may-minihttp/Cargo.toml b/frameworks/Rust/may-minihttp/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "may-minihttp"
+version = "0.1.0"
+authors = ["Xudong Huang <huangxu008@hotmail.com>"]
+
+[dependencies]
+num_cpus = "1.0"
+serde = "1.0"
+serde_json = "1.0"
+may = { git = "https://github.com/Xudong-Huang/may" }
+may_minihttp = { git = "https://github.com/Xudong-Huang/may_minihttp" }
diff --git a/frameworks/Rust/may-minihttp/README.md b/frameworks/Rust/may-minihttp/README.md
@@ -0,0 +1,15 @@
+# [may-minihttp](https://github.com/Xudong-Huang/may_minihttp) web framework
+
+## Description
+
+may-minihttp is a small, fast micro http framework based on [May](https://github.com/Xudong-Huang/may)
+
+## Test URLs
+
+### Test 1: JSON Encoding 
+
+    http://localhost:8080/json
+
+### Test 2: Plaintext
+
+    http://localhost:8080/plaintext
diff --git a/frameworks/Rust/may-minihttp/benchmark_config.json b/frameworks/Rust/may-minihttp/benchmark_config.json
@@ -0,0 +1,23 @@
+{
+  "framework": "may-minihttp",
+  "tests": [
+    {
+      "default": {
+        "json_url": "/json",
+        "plaintext_url": "/plaintext",
+        "port": 8080,
+        "approach": "Realistic",
+        "classification": "Micro",
+        "database": "None",
+        "framework": "may-minihttp",
+        "language": "Rust",
+        "orm": "raw",
+        "platform": "Rust",
+        "webserver": "may-minihttp",
+        "os": "Linux",
+        "database_os": "Linux",
+        "display_name": "may-minihttp"
+      }
+    }
+  ]
+}
diff --git a/frameworks/Rust/may-minihttp/may-minihttp.dockerfile b/frameworks/Rust/may-minihttp/may-minihttp.dockerfile
@@ -0,0 +1,8 @@
+FROM tfb/rust:latest
+
+COPY ./ ./
+
+RUN cargo clean
+RUN RUSTFLAGS="-C target-cpu=native" cargo build --release
+
+CMD ./target/release/may-minihttp
diff --git a/frameworks/Rust/may-minihttp/src/main.rs b/frameworks/Rust/may-minihttp/src/main.rs
@@ -0,0 +1,40 @@
+extern crate may;
+extern crate num_cpus;
+#[macro_use]
+extern crate serde_json;
+extern crate may_minihttp;
+
+use std::io;
+use may_minihttp::{HttpServer, HttpService, Request, Response};
+
+struct Techempower;
+
+impl HttpService for Techempower {
+    fn call(&self, req: Request) -> io::Result<Response> {
+        let mut resp = Response::new();
+
+        // Bare-bones router
+        match req.path() {
+            "/json" => {
+                resp.header("Content-Type", "application/json");
+                *resp.body_mut() =
+                    serde_json::to_vec(&json!({"message": "Hello, World!"})).unwrap();
+            }
+            "/plaintext" => {
+                resp.header("Content-Type", "text/plain")
+                    .body("Hello, World!");
+            }
+            _ => {
+                resp.status_code(404, "Not Found");
+            }
+        }
+
+        Ok(resp)
+    }
+}
+
+fn main() {
+    may::config().set_io_workers(num_cpus::get());
+    let server = HttpServer(Techempower).start("0.0.0.0:8080").unwrap();
+    server.join().unwrap();
+}
diff --git a/frameworks/Rust/nickel/benchmark_config.json b/frameworks/Rust/nickel/benchmark_config.json
@@ -2,7 +2,6 @@
  "framework": "nickel",
  "tests": [{
    "default": {
-      "setup_file": "setup",
      "json_url": "/json",
      "plaintext_url": "/plaintext",
      "port": 8080,
diff --git a/frameworks/Rust/nickel/nickel.dockerfile b/frameworks/Rust/nickel/nickel.dockerfile
@@ -0,0 +1,8 @@
+FROM tfb/rust:latest
+
+COPY ./ ./
+
+RUN cargo clean
+RUN RUSTFLAGS="-C target-cpu=native" cargo build --release
+
+CMD ./target/release/nickel
diff --git a/frameworks/Rust/nickel/setup.sh b/frameworks/Rust/nickel/setup.sh
diff --git a/frameworks/Rust/rouille/benchmark_config.json b/frameworks/Rust/rouille/benchmark_config.json
@@ -2,7 +2,6 @@
  "framework": "rouille",
  "tests": [{
    "default": {
-      "setup_file": "setup",
      "json_url": "/json",
      "plaintext_url": "/plaintext",
      "port": 8080,
diff --git a/frameworks/Rust/rouille/rouille.dockerfile b/frameworks/Rust/rouille/rouille.dockerfile
@@ -0,0 +1,8 @@
+FROM tfb/rust:latest
+
+COPY ./ ./
+
+RUN cargo clean
+RUN RUSTFLAGS="-C target-cpu=native" cargo build --release
+
+CMD ./target/release/rouille
diff --git a/frameworks/Rust/rouille/setup.sh b/frameworks/Rust/rouille/setup.sh
diff --git a/frameworks/Rust/tokio-minihttp/benchmark_config.json b/frameworks/Rust/tokio-minihttp/benchmark_config.json
@@ -2,7 +2,6 @@
  "framework": "tokio-minihttp",
  "tests": [{
    "default": {
-      "setup_file": "setup",
      "json_url": "/json",
      "plaintext_url": "/plaintext",
      "db_url": "/db",
diff --git a/frameworks/Rust/tokio-minihttp/setup.sh b/frameworks/Rust/tokio-minihttp/setup.sh
diff --git a/frameworks/Rust/tokio-minihttp/tokio-minihttp.dockerfile b/frameworks/Rust/tokio-minihttp/tokio-minihttp.dockerfile
@@ -0,0 +1,8 @@
+FROM tfb/rust:latest
+
+COPY ./ ./
+
+RUN cargo clean
+RUN RUSTFLAGS="-C target-cpu=native" cargo build --release
+
+CMD ./target/release/tokio-minihttp
diff --git a/toolset/setup/linux/docker/base.dockerfile b/toolset/setup/linux/docker/base.dockerfile
@@ -1,7 +1,21 @@
 FROM ubuntu:16.04

 RUN apt-get update
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git
+
+# Install some common development tools
+RUN apt-get install -y software-properties-common build-essential curl locales wget unzip git \
+    libmysqlclient-dev libpq-dev \
+    libpcre3 libpcre3-dev \
+    libssl-dev libcurl4-openssl-dev \
+    zlib1g-dev \
+    libreadline6-dev \
+    libbz2-dev \
+    libxslt-dev libgdbm-dev ncurses-dev  \
+    libffi-dev libtool bison libevent-dev \
+    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
+    liborc-0.4-0 libgnutls-dev \
+    libjson0-dev libmcrypt-dev libicu-dev \
+    re2c libnuma-dev

 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8  
diff --git a/toolset/setup/linux/docker/languages/haskell.dockerfile b/toolset/setup/linux/docker/languages/haskell.dockerfile
@@ -0,0 +1,3 @@
+FROM tfb/base:latest
+
+RUN curl -sSL https://get.haskellstack.org/ | sh
diff --git a/toolset/setup/linux/docker/languages/nim.dockerfile b/toolset/setup/linux/docker/languages/nim.dockerfile
@@ -0,0 +1,21 @@
+FROM tfb/nginx:latest
+
+ENV NIM_VERSION="0.11.2"
+ENV NIM_CSOURCES="6bf2282"
+
+RUN wget https://github.com/nim-lang/Nim/archive/v$NIM_VERSION.tar.gz
+RUN tar xvf v$NIM_VERSION.tar.gz
+RUN mv Nim-$NIM_VERSION nim
+
+RUN cd nim && \
+    git clone git://github.com/nim-lang/csources.git && \
+    cd csources && \
+    git checkout $NIM_CSOURCES && \
+    sh build.sh && \
+    cd .. && \
+
+    bin/nim c koch && \
+    ./koch boot -d:release
+
+ENV NIM_HOME=/nim
+ENV PATH=${NIM_HOME}/bin:${PATH}
diff --git a/toolset/setup/linux/docker/languages/rust.dockerfile b/toolset/setup/linux/docker/languages/rust.dockerfile
@@ -0,0 +1,12 @@
+FROM tfb/base:latest
+
+ENV RUST_VERSION="1.24.1"
+
+RUN wget https://static.rust-lang.org/dist/rust-${RUST_VERSION}-x86_64-unknown-linux-gnu.tar.gz
+RUN tar xvf rust-${RUST_VERSION}-x86_64-unknown-linux-gnu.tar.gz
+
+RUN cd rust-${RUST_VERSION}-x86_64-unknown-linux-gnu && \
+	./install.sh --prefix=/rust
+
+ENV LD_LIBRARY_PATH=/rust/lib:${LD_LIBRARY_PATH}
+ENV PATH=/rust/bin:${PATH}
diff --git a/toolset/setup/linux/docker/systools/nimble.dockerfile b/toolset/setup/linux/docker/systools/nimble.dockerfile
@@ -0,0 +1,11 @@
+FROM tfb/nim:latest
+  
+ENV NIMBLE_VERSION="0.6.2"
+
+RUN cd $NIM_HOME && \
+    wget https://github.com/nim-lang/nimble/archive/v$NIMBLE_VERSION.tar.gz && \
+    tar xvf v$NIMBLE_VERSION.tar.gz && \
+    mv nimble-$NIMBLE_VERSION nimble && \
+    cd nimble && \
+    ../bin/nim c src/nimble && \
+    mv src/nimble ../bin/
diff --git a/toolset/setup/linux/frameworks/jester.sh b/toolset/setup/linux/frameworks/jester.sh
diff --git a/toolset/setup/linux/languages/haskell.sh b/toolset/setup/linux/languages/haskell.sh
diff --git a/toolset/setup/linux/languages/java8.sh b/toolset/setup/linux/languages/java8.sh
diff --git a/toolset/setup/linux/languages/nim.sh b/toolset/setup/linux/languages/nim.sh
diff --git a/toolset/setup/linux/languages/rust.sh b/toolset/setup/linux/languages/rust.sh
diff --git a/toolset/setup/linux/systools/nimble.sh b/toolset/setup/linux/systools/nimble.sh