Merge pull request #27 from agustin107/develop

Bugs Fixing (E4T10aFE5 - E4T10bFE2 - E4T10aFE4 - E4T10bFE1)