Merge pull request #34 from sli-fox/marky_branch

Marky branch
Merge pull request #35 from sli-fox/marky_branch

Marky branch