diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a6d77a..7307587 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,23 @@
 Change log
 ==========
 
+0.9.5 (2017-05-19)
+-------------------
+
+### New features
+
+- Major search improvement. Now search works on all the fields at once, this means if you search for "John" Ambar will search for it in files content, full names, sources and authors. This applies to phrase search and fuzzy search as well
+- New API methods added to allow users to use Ambar only as a content extractor (please refer to our [API documentation](https://github.com/RD17/ambar/blob/master/API_DOC.md#files) for further information)
+- Chinese language analyzer added, use `ambar_cn` in `config.json` to enable it
+
+### Bugfixes
+- Minor UI and WebApi bugfixes (thanks for your feedback)
+
+### Migration from 0.9.4
+
+- Migration to this release requires reset of all your data, as we changed ElasticSearch mappings. Use this migration command: `sudo ./ambar.py reset && sudo ./ambar.py update`
+
+
 0.9.4 (2017-05-11)
 -------------------
 
diff --git a/Crawler b/Crawler
index 974a16d..5154ceb 160000
--- a/Crawler
+++ b/Crawler
@@ -1 +1 @@
-Subproject commit 974a16d6ad5272c85e083f17284633c70fe7df6e
+Subproject commit 5154ceb544292c8bb15f21f043ba4553b13a711e
diff --git a/ElasticSearch b/ElasticSearch
index 0cf34c2..1eae837 160000
--- a/ElasticSearch
+++ b/ElasticSearch
@@ -1 +1 @@
-Subproject commit 0cf34c24140d00f49385754340aabc44bf135336
+Subproject commit 1eae8374d2f43bcb39c3546a9eafe39aa4c7e9c6
diff --git a/FrontEnd b/FrontEnd
index c7b616a..bf22fc7 160000
--- a/FrontEnd
+++ b/FrontEnd
@@ -1 +1 @@
-Subproject commit c7b616a80c9319639189d7a7fa2c80c9a3dbfa53
+Subproject commit bf22fc715f87053938590cf447a8befc985e79b8
diff --git a/README.md b/README.md
index cfab914..62224f0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Version](https://img.shields.io/badge/Version-v0.9.4-brightgreen.svg)](https://ambar.cloud)
+[![Version](https://img.shields.io/badge/Version-v0.9.5-brightgreen.svg)](https://ambar.cloud)
 [![License](https://img.shields.io/badge/License-Fair%20Source%20v0.9-blue.svg)](https://github.com/RD17/ambar/blob/master/License.txt)
 [![StackShare](https://img.shields.io/badge/tech-stack-0690fa.svg?style=flat)](https://stackshare.io/ambar/ambar)
 
@@ -13,7 +13,7 @@ If you like Ambar please :star: it!
 
 ## What is Ambar
 
-Ambar is a simple document management system with automated crawling, OCR, deduplication and ultra-fast full-text search. Imagine having billion of files in different formats like xls, doc, txt, pdf, ppt, etc..., in any encoding. Ambar securely stores them and gives you an ability to search through their content and metadata in milliseconds. It is very lightweight, simple and intuitive, but yet very fast and powerful in terms of data amount and scaling. All the rocket-science is hidden behind the simple UI.
+Ambar is a document search engine with automated crawling, OCR, deduplication and ultra-fast full-text search. Imagine having billion of files in different formats like xls, doc, txt, pdf, ppt, etc..., in any encoding. Ambar securely stores them and gives you an ability to search through their content and metadata in milliseconds. It is very lightweight, simple and intuitive, but yet very fast and powerful in terms of data amount and scaling. All the rocket-science is hidden behind the simple UI.
 
 ## Features
 
@@ -27,7 +27,7 @@ Ambar is a simple document management system with automated crawling, OCR, dedup
 * Search By Date (when: yesterday, today, lastweek, etc)
 * Search By Size (size>1M)
 * Search As You Type
-* Supported language analyzers (Eng, Rus, Ita, Deu, Fra, Spa, Pl, Nld, CJK)
+* Supported language analyzers (Eng, Rus, Ita, Deu, Fra, Spa, Pl, Nld, CJK, Cn)
 
 ### Crawling
 * [SMB Crawling](https://blog.ambar.cloud/advanced-ambar-usage-crawling-your-own-shared-folders/)