[BUGFIX] Wrong usage of use statement

Resolves errors like "The use statement
with non-compound name 'Client' has no effect"
Merge pull request #169 from opendo/master

[BUGFIX] Wrong usage of use statement