branch b #1
Merge pull request #2 from epall/branch_b

branch b #1