Handle swappable User model
Merge pull request #7 from fle/master

Handle swappable User model