Merge pull request #1 from rmariuzzo/develop

Updates on develop
Merge pull request #2 from rmariuzzo/develop

Current development.