Merge pull request #2 from federicobucchi/test_d

changes c
Merge pull request #3 from federicobucchi/test_e

Test e
Merge branch 'test_d' of github.com:federicobucchi/test into test_d