New files
Merge pull request #22 from marcogarieri/master

New files