Merge pull request #1 from basho/master

Master