Merge pull request #371 from astern7/master

Some REDIS work + minor changes