Merge pull request #2 from andrepl/master

Preserve custom names on entities