Merge pull request #8 from alexcodreanu86/user

User
Merge branch 'master' into user
Merging master