Support for configurable keep-alives. GH #25