Merge pull request #37 from sli-fox/steph_branch

Steph branch