added second func
Merge branches 'branch1' and 'master'