Merge pull request #28 from tms/master

Missed TinyName conversion in rebase