Foo
Merge pull request #25 from basho/pr-11

Foo

Reviewed-by: reiddraper