update
Merge pull request #17 from adiucu01/Update-Cristi's-issues

update