branch a #1

This is a pull request between master and branch_a