added Optional and NullableOptional iterators
Merge branch 'generate-optionals' into develop