added daemons
Merge branch 'beta'