last changes in photo
Merge origin/master