Merge pull request #17 from sli-fox/steph_branch

Steph branch