Use the given-name as the surname if needed

fixes #53