Oops, I thought I already merged this. @sgrif could you add nodoc comment?