Add typename #18
Merge branch 'tparam'