Upgrade to peep v2

@jgmize r?