1st merge

yetkin branch into master
1st merge

yetkin branch into master