Merge pull request #22 from RJFryman/master

Checking an update between user-activity and master branches
Merge pull request #23 from RJFryman/user-activity

Merge pull request #22 from RJFryman/master