Merge pull request #1653 from sebweb3r/daemon

add corrections for daemon and demon