Merge pull request #5 from spindance/feature/user-id

Feature/user
Merge branch 'master' into feature/response-data