User update
Merge pull request #50 from daverboy23/master

User update