Update
Merge pull request #21 from basho/pr-7

Update

Reviewed-by: reiddraper