pull request
Merge pull request #2 from hartsick/user

pull request