update gallery - must fix !!!
Merge origin/master