Fixing @NotNull notation (ToDo) + jar name