New doxy
Merge pull request #116 from sli-fox/steph_branch

New doxy