update to match the master
Merge pull request #21 from RJFryman/user-activity

update to match the master :zap: