harvesting now works
Merge branch 'master' into harvesting