merge small fix daemon and close branche