Generator now output descritors as well.
Merge branch 'master' of https://github.com/travisdesell/wildlife_at_home