Merge pull request #2 from alephtwo/master

User stuff