up to 7.2.1
Merge pull request #4 from jendiamond/modeling-users

up to 7.2.1