Foo
Merge pull request #31 from basho/pr-16

Foo

Reviewed-by: Vagabond