Code

Merge branch 'ad/redis'