Merge pull request #5 from mauriciolobo/developer

Developer
Dev2 to Dev1
Merge pull request #6 from mauriciolobo/dev2

Dev2