Merge underscore+typed versions together
Merge pull request #820 from jbaldwin/master

Merge underscore+typed versions together