Take an http.Handler instead

Fix #1