Merge pull request #2 from fgadioli/deve

file c
file 5
Merge remote-tracking branch 'origin/master' into deve