Merge pull request #1 from iamjz/SetupUserModels

Merging into master branch. for testing.
Merge pull request #2 from iamjz/master

Merge pull request #1 from iamjz/SetupUserModels