second commit
Merge pull request #1 from fcobas/branch2

second commit