Merge pull request #1 from mauriciolobo/developer

Developer
Merge pull request #2 from mauriciolobo/dev2

Dev 2 inda house
Dev is back!
Dev 2 back to Dev
Dev 1 received
Dev to master
Dev 2 is back