Code for Redis 2.6

Code change after code code review