Splitted buckets
Merge pull request #24 from jaytaph/ut6

Splitted buckets