Merge pull request #1 from broxana/branch1

c1
c2
c3