Merge pull request #20 from RJFryman/user-activity

User activity - fixed merge conflicts