prep for merge
Mergin
Merge branch 'master' of https://github.com/timestep/adMan
merging