Merge pull request #1 from nicb/master

added Forma
La Forma
Merge pull request #3 from SMERM/master

Sulla Forma, 12062014