Getting the client properly from settings
Merge pull request #2 from josem/patch-1

Getting the client properly from settings