Merge pull request #22 from RJFryman/master

Checking an update between user-activity and master branches