minor changes
minor changes
Merge pull request #3 from marinamarina/devel

Devel