Merge pull request #1 from mauriciolobo/developer

Developer
Dev 2 inda house
Merge pull request #2 from mauriciolobo/dev2

Dev 2 inda house
Dev is back!