Merge pull request #4 from benctamas/master

toward c4
Merge branch 'master' into feat-buckets