Merge pull request #3 from Chris--A/typename-fix