merge from franseda and add log_book