add user to return output
Merge branch 'release/nick'