README merged from basho/master