Merge pull request #106 from sli-fox/mark_branch

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