diff --git a/README.md b/README.md
index edf2fc818..c26d7ca8a 100644
--- a/README.md
+++ b/README.md
@@ -38,11 +38,30 @@ Features
* Supports OSGi
* With over 110 unit tests
+Projects using Redisson
+================================
+Setronica: [setronica.com](http://setronica.com/)
+Monits: [monits.com](http://monits.com/)
+Brookhaven National Laboratory: [bnl.gov](http://bnl.gov/)
+Netflix Dyno client: [dyno] (https://github.com/Netflix/dyno)
Recent Releases
================================
####Please Note: trunk is current development branch.
+####18-Nov-2014 - version 1.1.6 released
+Feature - `RBucket.exists` and `RBucket.existsAsync` methods added
+Feature - `RMap.addAndGet` method added
+Feature - database index via `database` and operation timeout via `timeout` config params added
+Improvement - `RLock` optimization
+__Breaking api change__ - Redisson now uses `RedissonClient` interface
+Fixed - NPE in `CommandOutput`
+Fixed - unsubscribing during `RTopic.removeListener`
+Fixed - all object names encoding, no more quotes
+Fixed - HashedWheelTimer shutdown
+Fixed - `RLock` race conditions (thanks to jsotuyod and AndrewKolpakov)
+Fixed - `RCountDownLatch` race conditions
+
####23-Jul-2014 - version 1.1.5 released
Feature - operations auto-retry. `retryAttempts` and `retryInterval` params added for each connection type
Feature - `RMap.filterEntries`, `RMap.getAll`, `RMap.filterKeys`, `RMap.filterValues` methods added
@@ -118,5 +137,5 @@ Include the following to your dependency list:
org.redisson
redisson
- 1.1.5
+ 1.1.6
diff --git a/src/main/java/org/redisson/RedissonMap.java b/src/main/java/org/redisson/RedissonMap.java
index be7bcfd8e..d8dbd1041 100644
--- a/src/main/java/org/redisson/RedissonMap.java
+++ b/src/main/java/org/redisson/RedissonMap.java
@@ -19,13 +19,7 @@ import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.Promise;
import java.math.BigDecimal;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
+import java.util.*;
import org.redisson.async.AsyncOperation;
import org.redisson.async.OperationListener;
@@ -93,6 +87,9 @@ public class RedissonMap extends RedissonExpirable implements RMap {
@Override
public Map getAll(final Set keys) {
+ if (keys.size() == 0) {
+ return Collections.emptyMap();
+ }
List list = connectionManager.read(new ResultOperation, V>() {
@Override
protected Future> execute(RedisAsyncConnection