merge with cristian branch
Merge pull request #4 from jcliberatol/origin/merge

merge with cristian branch