bugfix v.1.1 for production
Second branch merger with the master
r2 index last changes added