adaptions to daos
Merge branch 'master' of https://github.com/philippschnatter/wfm_bakewell