Bring up to date
Added a keep-alive
Fixed potential memory leak
Fixed merge