Add positive type. Update natural type. Add tests
Merge branch 'master' into more-types
merge master