andrewuhl Changed NA handling, updated docs