Add timeout before closing server
Merge