Updating for 1.5.2
Merge pull request #54 from basho/cs-152

Updating for 1.5.2