Merge pull request #12 from alexcodreanu86/user

User
added stuff