fix error in R-ints
Merge branch '21-manual' into 22-more-scalars
update to R-ints
Merge branch '21-scalars' into 22-more-scalars