initial commit
Add support for UserId & Location data.
Merge branch 'release/0.10'