Merge pull request #41 from UAI-Sonda/develop

Develop
Merge branch 'develop'
Merge branch 'develop'
fix de warnings