User adjustments
Merge pull request #11 from brint/master

User adjustments