diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b838155..6331fd7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,53 +2,65 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.6.0] - 2016-12-11
+### Added
+- #87: Fencing event grouping (@huangpeizhi)
+
+### Fixed
+- #91: Wrong winding order for CirclePolygon function (@antonioromano)
+- #73: Corruption for AOFSHRINK (@huangpeizhi)
+- #71: Lower memory usage. About 25% savings (@thisisaaronland, @umpc)
+- Polygon raycast bug. tidwall/poly#1 (@drewlesueur)
+- Added black-box testing
+
 ## [1.5.4] - 2016-11-17
 ### Fixed
-- #84: Hotfix - roaming fence deadlock
+- #84: Hotfix - roaming fence deadlock (@tomquas)
 
 ## [1.5.3] - 2016-11-16
 ### Added
-- #4: Official docker support
+- #4: Official docker support (@gordysc)
+
 ### Fixed
-- #77: NX/XX bug
-- #76: Match on prefix star
-- #82: Allow for precise search for strings
-- #83: Faster congruent modulo for points
+- #77: NX/XX bug (@damariei)
+- #76: Match on prefix star (@GameFreedom, @icewukong)
+- #82: Allow for precise search for strings (@GameFreedom)
+- #83: Faster congruent modulo for points (@icewukong, @umpc)
 
 ## [1.5.2] - 2016-10-20
 ### Fixed
-- #70: Invalid results for INTERSECTS query
+- #70: Invalid results for INTERSECTS query (@thisisaaronland)
 
 ## [1.5.1] - 2016-10-19
 ### Fixed
-- #67: Call the EXPIRE command hangs the server
-- #64: Missing points in 'Nearby' queries
+- #67: Call the EXPIRE command hangs the server (@PapaStifflera)
+- #64: Missing points in 'Nearby' queries (@umpc)
 
 ## [1.5.0] - 2016-10-03
 ### Added
-- #61: Optimized queries on 3d objects
-- #60: Added [NX|XX] keywords to SET command
-- #29: Generalized hook interface
+- #61: Optimized queries on 3d objects (@damariei)
+- #60: Added [NX|XX] keywords to SET command (@damariei)
+- #29: Generalized hook interface (@jeremytregunna)
 - GRPC geofence hook support 
 
 ### Fixed
-- #62: Potential Replace Bug Corrupting the Index
-- #57: CRLF codes in info after bump from 1.3.0 to 1.4.2
+- #62: Potential Replace Bug Corrupting the Index (@umpc)
+- #57: CRLF codes in info after bump from 1.3.0 to 1.4.2 (@olevole)
 
 ## [1.4.2] - 2016-08-26
 ### Fixed
-- #49. Allow fragmented pipeline requests
-- #51: Allow multispace delim in native proto
-- #50: MATCH with slashes 
-- #43: Linestring nearby search correction
+- #49. Allow fragmented pipeline requests (@owaaa)
+- #51: Allow multispace delim in native proto (@huangpeizhi)
+- #50: MATCH with slashes (@huangpeizhi)
+- #43: Linestring nearby search correction (@owaaa)
 
 ## [1.4.1] - 2016-08-26
 ### Added
-- #34: Added "BOUNDS key" command
+- #34: Added "BOUNDS key" command (@icewukong)
 
 ### Fixed
-- #38: Allow for nginx support
-- #39: Reset requirepass 
+- #38: Allow for nginx support (@GameFreedom)
+- #39: Reset requirepass (@GameFreedom)
 
 ## [1.3.0] - 2016-07-22
 ### Added
@@ -58,17 +70,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Scans can now order descending
 
 ### Fixed
-- #28: fix windows cli issue
+- #28: fix windows cli issue (@zhangkaizhao)
 
 ## [1.2.0] - 2016-05-24
 ### Added
-- #17: Roaming Geofences for NEARBY command
-- #15: maxmemory config setting
+- #17: Roaming Geofences for NEARBY command (@ElectroCamel, @davidxv)
+- #15: maxmemory config setting (@jrots)
 
 ## [1.1.4] - 2016-04-19
 ### Fixed
-- #12: Issue where a newline was being added to HTTP POST requests
-- #13: OBJECT keyword not accepted for WITHIN command
+- #12: Issue where a newline was being added to HTTP POST requests (@davidxv)
+- #13: OBJECT keyword not accepted for WITHIN command (@ray93)
 - Panic on missing key for search requests
 
 ## [1.1.2] - 2016-04-12
diff --git a/README.md b/README.md
index c9106b9c..26b175e7 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,11 @@
 </p>
 <p align="center">
 <a href="https://travis-ci.org/tidwall/tile38"><img src="https://travis-ci.org/tidwall/tile38.svg?branch=master" alt="Build Status"></a>
-<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.5.4-green.svg" alt="Version"></a>
+<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.6.0-green.svg" alt="Version"></a>
 </p>
 
 Tile38 is an open source (MIT licensed), in-memory geolocation data store, spatial index, and realtime geofence. It supports a variety of object types including lat/lon points, bounding boxes, XYZ tiles, Geohashes, and GeoJSON. 
 
-
-
 <p align="center">
 <i>This README is quick start document. You can find detailed documentation at <a href="http://tile38.com">http://tile38.com</a>.</i><br><br>
 <a href="#searching"><img src="/doc/search-nearby.png" alt="Nearby" border="0" width="120" height="120"></a>
diff --git a/build.sh b/build.sh
index d47feb72..3fc7ebff 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VERSION="1.5.4"
+VERSION="1.6.0"
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2e5d47f8..dc71fb0b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4
 
-ENV TILE38_VERSION 1.5.4
+ENV TILE38_VERSION 1.6.0
 ENV TILE38_DOWNLOAD_URL https://github.com/tidwall/tile38/releases/download/$TILE38_VERSION/tile38-$TILE38_VERSION-linux-amd64.tar.gz
 
 RUN addgroup -S tile38 && adduser -S -G tile38 tile38