Merge pull request #7 from sli-fox/steph_branch

Steph branch