Daemon mode working again. Closes #131