Added user support
Merge pull request #6 from manu29d/master

Added user support