improved support for tagged lang & factors
Merge pull request #4 from gordonwoodhull/master

improved support for tagged lang & factors