Added people merge and name aliases, #56