Photo naming

Adds a different implementation of the feature in pull request #6