Merge pull request #78 from domob1812/name-list

Further optimise name_list.