61 activity logic

Toby Hodgesrequested to merge
61-activity-logic into master

should fix #61 in the main repo

Merge request reports