Merge pull request #3 from mschuma/daemon

Daemon code review/merge request
Merge remote-tracking branch 'origin/master' into installer