Merge pull request #1 from iamjz/SetupUserModels

Merging into master branch. for testing.