last changes
Merge pull request #17 from Imara90/Imara_FFenzo

last changes