Phom/first branch

pull request from first_branch to master