Merge origin/master
fixex accordin to mail from friday