refs #39 replace NotNull with Nonnull