Updated
Merge manually from PR https://github.com/imalberto/photonews/pull/7/files