Daemon can now be stopped. Fixes #26
Merge pull request #28 from wmak/hotfix/26

Daemon can now be stopped. Fixes #26