diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d5c4091..d1c44c33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,24 @@
 # Changelog
 
-## 4.1.0 - 2018-03-14
+## 1.0.0-alpha - 2018-08-02
+- Release 1.0.0
+
+## 4.1.0-dev - 2018-03-14
 
 - Upgrade to Laravel 5.6
 - Update npm dependencies
 - Enabled Mix [esModule](https://github.com/JeffreyWay/laravel-mix/pull/1526#issuecomment-373044182) by default
 - Lint with eslint-plugin-vue and eslint-config-standard 
 
-## 4.0.0 - 2018-01-23
+## 4.0.0-dev - 2018-01-23
 
 - Brought back the `layout` property in pages that was removed in 3.0. By default it's set to `default` (`~/layouts/default.vue`).
 
-## 3.0.1 - 2018-01-22
+## 3.0.1-dev - 2018-01-22
 
 - Removed middleware from routes, since they don't work when you press the back button. Now you have to use the `middleware` property in pages.
 
-## 3.0.0 - 2018-01-22
+## 3.0.0-dev - 2018-01-22
 
 - Removed `layout` property from pages in favor of explicit layout components
 - Improved middleware system, you can either define it on a route or directly on a component
@@ -23,23 +26,23 @@
 - Change jwt token ttl to one day
 - Fixed  hot module replacement
 
-## 2.2.1 - 2018-01-19
+## 2.2.1-dev - 2018-01-19
 
 - Upgrade to Bootstrap 4
 
-## 2.2.0 - 2018-01-16
+## 2.2.0-dev - 2018-01-16
 
 - Added dynamic import for pages
 - Added locale with dynamic import
 - Import shakable fontawesome module
 
-## 2.1.0 - 2018-01-10
+## 2.1.0-dev - 2018-01-10
 
 - Simplifyd password reset
 - Upgrade to Bootstrap 4 beta3
 - Added oauth with popup window
 
-## 2.0.0 - 2017-12-19
+## 2.0.0-dev - 2017-12-19
 
 - Added support for Socialite
 - Added dropdown to select the locale 
@@ -52,7 +55,7 @@
 - Namespaced store modules  
 - Published project to Packagist 
 
-## 1.0.0 - 2017-09-02
+## 1.0.0-dev - 2017-09-02
 
 - Upgrade to Laravel 5.5.
 - Upgrade to Bootstrap 4 beta1.
diff --git a/Dockerfile b/Dockerfile
index c1fb53e0..3988574a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,11 @@
+# Build frontend assets
+FROM node as frontend
+WORKDIR /app
+ADD . /app
+RUN npm install
+RUN npm run production
+
+# Build backend
 FROM php:7.1.3
 RUN apt-get update -y && apt-get install -y openssl zip unzip git zlib1g-dev netcat mysql-client libgd-dev libfreetype6-dev libjpeg62-turbo-dev libpng12-dev
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
diff --git a/readme.md b/readme.md
index 591fad7e..38e97b74 100644
--- a/readme.md
+++ b/readme.md
@@ -47,6 +47,13 @@ npm run hot
 npm run production
 ```
 
+#### Todo 
+- [ ] Unit test on supplier booking 
+- [ ] Continous delivery with npm build 
+- [ ] Add comments in controller functions 
+- [ ] Store files to AWS S3 
+- [ ] Real time rate update 
+
 ## Changelog
 
 Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recently.