add daemon support
Merge branch 'daemon' into 'master'

Daemon