Bugfix/cli daemon interaction

Fixes #182