Merge pull request #20 from IrisMa/master

merge
Merge pull request #21 from IrisMa/master

Complete modeling users phase