Merge pull request #1 from Roambi/feature/base-client

Feature/base client
Merge branch 'develop' into feature/base-client