Extends name
Merge pull request #108 from LegoStormtroopr/name-fixes

Extends name field