diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cf5340..8f60d13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Turn on checkstyle JavaDocs module.
 - Add updates to the protocol, like new `ControlMessage`.
 
+## [1.6.5](https://github.com/appulse-projects/encon-java/releases/tag/1.6.5) - 2018-09-28
+
+### Changed
+
+- Quick fix for [GitHub issue](https://github.com/appulse-projects/encon-java/issues/10), added `ATOM` and `SMALL_ATOM` serialization.
+
 ## [1.6.4](https://github.com/appulse-projects/encon-java/releases/tag/1.6.4) - 2018-09-14
 
 ### Added
diff --git a/README.md b/README.md
index d16cc61..5c1c775 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ $> mvn clean compile
 [INFO] ------------------------------------------------------------------------
 [INFO] Reactor Summary:
 [INFO]
-[INFO] encon 1.6.4 ........................................ SUCCESS [  1.210 s]
+[INFO] encon 1.6.5 ........................................ SUCCESS [  1.210 s]
 [INFO] encon-common ....................................... SUCCESS [ 25.693 s]
 [INFO] encon-terms ........................................ SUCCESS [ 27.517 s]
 [INFO] encon-config ....................................... SUCCESS [ 18.707 s]
@@ -64,7 +64,7 @@ $> mvn clean compile
 [INFO] handler-advanced ................................... SUCCESS [ 11.289 s]
 [INFO] load-config ........................................ SUCCESS [  3.725 s]
 [INFO] load-config-spring ................................. SUCCESS [  6.420 s]
-[INFO] benchmark 1.6.4 .................................... SUCCESS [  5.594 s]
+[INFO] benchmark 1.6.5 .................................... SUCCESS [  5.594 s]
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index cdaeeef..2066446 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <artifactId>benchmark</artifactId>
diff --git a/encon-common/pom.xml b/encon-common/pom.xml
index 727cf92..b41a7b9 100644
--- a/encon-common/pom.xml
+++ b/encon-common/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <artifactId>encon-common</artifactId>
diff --git a/encon-config/README.md b/encon-config/README.md
index 2cc279c..0e2c281 100644
--- a/encon-config/README.md
+++ b/encon-config/README.md
@@ -14,7 +14,7 @@ First of all, add config's dependency:
   <dependency>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-config</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </dependency>
   ...
 </dependencies>
@@ -23,7 +23,7 @@ First of all, add config's dependency:
 **Gradle**:
 
 ```groovy
-compile 'io.appulse.encon:encon-config:1.6.4'
+compile 'io.appulse.encon:encon-config:1.6.5'
 ```
 
 ### File based configuration
diff --git a/encon-config/pom.xml b/encon-config/pom.xml
index 9d22db9..71aa168 100644
--- a/encon-config/pom.xml
+++ b/encon-config/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <artifactId>encon-config</artifactId>
diff --git a/encon-databind/README.md b/encon-databind/README.md
index dd888a7..ca4b5c8 100644
--- a/encon-databind/README.md
+++ b/encon-databind/README.md
@@ -14,12 +14,12 @@ First of all, add databind's dependency:
   <dependency>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </dependency>
   <dependency>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-databind</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </dependency>
   ...
 </dependencies>
@@ -28,8 +28,8 @@ First of all, add databind's dependency:
 **Gradle**:
 
 ```groovy
-compile 'io.appulse.encon:encon:1.6.4'
-compile 'io.appulse.encon:encon-databind:1.6.4'
+compile 'io.appulse.encon:encon:1.6.5'
+compile 'io.appulse.encon:encon-databind:1.6.5'
 ```
 
 Let's imagine, you have POJO like this:
diff --git a/encon-databind/pom.xml b/encon-databind/pom.xml
index 881e8d2..07463cd 100644
--- a/encon-databind/pom.xml
+++ b/encon-databind/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <artifactId>encon-databind</artifactId>
diff --git a/encon-handler/README.md b/encon-handler/README.md
index 8c4ee52..c4ac5b4 100644
--- a/encon-handler/README.md
+++ b/encon-handler/README.md
@@ -14,7 +14,7 @@ First of all, add dependency:
   <dependency>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-handler</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </dependency>
   ...
 </dependencies>
@@ -23,7 +23,7 @@ First of all, add dependency:
 **Gradle**:
 
 ```groovy
-compile 'io.appulse.encon:encon-handler:1.6.4'
+compile 'io.appulse.encon:encon-handler:1.6.5'
 ```
 
 ### Basics
diff --git a/encon-handler/pom.xml b/encon-handler/pom.xml
index 2d91d9e..fb82bb0 100644
--- a/encon-handler/pom.xml
+++ b/encon-handler/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <artifactId>encon-handler</artifactId>
diff --git a/encon-spring/pom.xml b/encon-spring/pom.xml
index cd23387..8cc8886 100644
--- a/encon-spring/pom.xml
+++ b/encon-spring/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <artifactId>encon-spring</artifactId>
diff --git a/encon-terms/pom.xml b/encon-terms/pom.xml
index 50fb706..d8a2387 100644
--- a/encon-terms/pom.xml
+++ b/encon-terms/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <artifactId>encon-terms</artifactId>
diff --git a/encon-terms/src/main/java/io/appulse/encon/terms/type/ErlangAtom.java b/encon-terms/src/main/java/io/appulse/encon/terms/type/ErlangAtom.java
index a075d14..a0b9232 100644
--- a/encon-terms/src/main/java/io/appulse/encon/terms/type/ErlangAtom.java
+++ b/encon-terms/src/main/java/io/appulse/encon/terms/type/ErlangAtom.java
@@ -220,9 +220,11 @@ public boolean isTextual () {
   protected void serialize (ByteBuf buffer) {
     switch (getType()) {
     case SMALL_ATOM_UTF8:
+    case SMALL_ATOM:
       buffer.writeByte(bytes.length);
       break;
     case ATOM_UTF8:
+    case ATOM:
       buffer.writeShort(bytes.length);
       break;
     default:
diff --git a/encon/README.md b/encon/README.md
index 15d06b9..e947af2 100644
--- a/encon/README.md
+++ b/encon/README.md
@@ -21,7 +21,7 @@ Adding encon's dependency to your `JVM` app:
   <dependency>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </dependency>
   ...
 </dependencies>
@@ -30,7 +30,7 @@ Adding encon's dependency to your `JVM` app:
 **Gradle**:
 
 ```groovy
-compile 'io.appulse.encon:encon:1.6.4'
+compile 'io.appulse.encon:encon:1.6.5'
 ```
 
 ## Start the Node
diff --git a/encon/pom.xml b/encon/pom.xml
index cd4bee2..9380b1d 100644
--- a/encon/pom.xml
+++ b/encon/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <artifactId>encon</artifactId>
diff --git a/examples/custom-queue/pom.xml b/examples/custom-queue/pom.xml
index 5be1225..460e9ba 100644
--- a/examples/custom-queue/pom.xml
+++ b/examples/custom-queue/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>examples</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <groupId>io.appulse.encon.examples</groupId>
diff --git a/examples/databind/pom.xml b/examples/databind/pom.xml
index c68be54..ac909af 100644
--- a/examples/databind/pom.xml
+++ b/examples/databind/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>examples</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <groupId>io.appulse.encon.examples</groupId>
diff --git a/examples/echo-server-spring/pom.xml b/examples/echo-server-spring/pom.xml
index 2413194..2b24d4c 100644
--- a/examples/echo-server-spring/pom.xml
+++ b/examples/echo-server-spring/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>examples</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <dependencyManagement>
diff --git a/examples/echo-server/pom.xml b/examples/echo-server/pom.xml
index 9fcaac8..a22adf3 100644
--- a/examples/echo-server/pom.xml
+++ b/examples/echo-server/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>examples</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <groupId>io.appulse.encon.examples</groupId>
diff --git a/examples/handler-advanced/pom.xml b/examples/handler-advanced/pom.xml
index 9fafce3..00830c9 100644
--- a/examples/handler-advanced/pom.xml
+++ b/examples/handler-advanced/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>examples</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <groupId>io.appulse.encon.examples</groupId>
diff --git a/examples/handler-basic/pom.xml b/examples/handler-basic/pom.xml
index 6518f32..92d6d20 100644
--- a/examples/handler-basic/pom.xml
+++ b/examples/handler-basic/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>examples</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <groupId>io.appulse.encon.examples</groupId>
diff --git a/examples/load-config-spring/pom.xml b/examples/load-config-spring/pom.xml
index 4d9eaee..310b821 100644
--- a/examples/load-config-spring/pom.xml
+++ b/examples/load-config-spring/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>examples</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <dependencyManagement>
diff --git a/examples/load-config/pom.xml b/examples/load-config/pom.xml
index de568c8..1bcfca9 100644
--- a/examples/load-config/pom.xml
+++ b/examples/load-config/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>examples</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <groupId>io.appulse.encon.examples</groupId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 07a553e..f504ec0 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <artifactId>examples</artifactId>
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index c58d0c2..88e4a05 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>examples</artifactId>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
   </parent>
 
   <groupId>io.appulse.encon.examples</groupId>
diff --git a/pom.xml b/pom.xml
index 9dc0d00..a1413b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
 
   <groupId>io.appulse.encon</groupId>
   <artifactId>encon-parent</artifactId>
-  <version>1.6.4</version>
+  <version>1.6.5</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -74,7 +74,7 @@ limitations under the License.
     <url>https://github.com/appulse-projects/encon-java</url>
     <connection>scm:git:https://github.com/appulse-projects/encon-java.git</connection>
     <developerConnection>scm:git:https://github.com/appulse-projects/encon-java.git</developerConnection>
-    <tag>1.6.4</tag>
+    <tag>1.6.5</tag>
   </scm>
 
   <distributionManagement>