minor changes
templates added
Lisi
Merge pull request #1 from marinamarina/dev

minor changes