Merge pull request #46 from sli-fox/marky_branch

Marky branch