More name parsing...
Merge branch 'master' into development