Clients model streamlined
Merge pull request #10 from asocas/fix/streamlined_clients

Clients model streamlined