Integrates client bucket
Merge pull request #15 from mbiermann/develop

Integrates client bucket