multiple user test change
Merge branch 'master' of https://github.com/Paradigm4/shim