Merge pull request #7 from orkonano/master

Merge developer con master