Keepalive handler
Merge branch 'master' of github.com:rm-hull/programming-enchiladas