Adding Faces in Photos

Does anyone know how to add someone to a specific photo? So far it looks like you have to go through the faces album, find the picture and then add or merge it to the person's album. Is there no way to go to a specific photo (from the camera roll for example) and add someone to it? Like you could do in the old iPhoto ...