Updating user setup
Merge pull request #21 from brint/master

Updating user setup