Merge pull request #14 from lisandro-montano/develop

Includes US03, US07 and US12. Code review already completed
Merge pull request #15 from lisandro-montano/master

Merge pull request #14 from lisandro-montano/develop