User module in process
Merge pull request #232 from sexnothing/user

User module in process