Merge pull request #43 from sli-fox/marky_branch

Marky branch