Activation fix part 2
Merge branch 'master' of https://github.com/sli-fox/jamms into steph_branch
Merge pull request #63 from sli-fox/steph_branch

Steph branch
Activation fix part 2
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch