Pass user around correctly
Merge pull request #13 from borkweb/v1

Pass user around correctly