Feature/riak2.0

:octocat: