added new file to branch
Merge pull request #1355 from ferrao/add-ferrao

Merging PR from @ferrao