Manual Merge pull request #3
Implement basic user function.