fix logging
Merge branch 'master' into dao-refactor