Merge pull request #63 from willmo/router-lifetime