Redis

Merge Redis and Master