merged @jtamboli 's pull request into this branch.
merged @jtamboli 's pull request into this branch.

and updated some int/nsinteger/nsuinteger handling along the way.

ttscoff/nv,ttscoff/nv,sfsam/nvalt,sfsam/nvalt,ttscoff/nv,sfsam/nvalt,ttscoff/nv,ttscoff/nv,sfsam/nvalt,sfsam/nvalt,ttscoff/nv,sfsam/nvalt,sfsam/nvalt