Integrate work on daemon mode to main branch. Fixes build problems on master. #78

Closed dascandy closed 4 years ago