Can't remember if I sent you a pull request with the orphan expiration included so here it is again if I didn't