adapt to recent Gatherer changes
Merge pull request #85 from davidchambers/compatibility

adapt to recent Gatherer changes
makefile: integrate xyz