Daemon

Hi,

     I've checked in the fixes for the issues that were raised. Please do code review and merge the changes to master if the fix is ok.