Merge pull request #69 from sli-fox/steph_branch

Steph branch
Merge branch 'master' of https://github.com/sli-fox/jamms into steph_branch