Merge pull request #57 from sli-fox/marky_branch

Marky branch
Minor tweaks
Merge pull request #58 from sli-fox/steph_branch

Minor tweaks