Added some changes
Merge branch 'branch1-master'
Added more stuff

* branch1-master:
  Added some changes