Update before merge master

For gaining templete new fetures