Merge pull request #1 from TetAlius/branch1

Branch1
Merge branch 'branch1'
Merge branch 'master' into branch1