Integrates buckets
Merge pull request #12 from mbiermann/develop

Integrates buckets