some changes
some new stuff from first branch
Merge remote-tracking branch 'origin/first-branch' into second-branch