Merge pull request #3 from lpezet/master

merging master to develop
Merge pull request #4 from lpezet/develop

Merge pull request #3 from lpezet/master