Enhance daemon
Merge branch 'master' of github.com:typicode/katon