07 - Official release

Convergencia:
branch_alex [commit 16] e branch_myh [commit 22v1]