Simplify name parsing
Merge pull request #2 from jeffb-bt/master

Simplify name parsing