Merge pull request #4 from mauriciolobo/dev2

Dev 2 is back
Master is Here!
Dev 2 is back
Dev1 Merge!
Dev 1
Merge Commit
Merge Fixed
Merge pull request #5 from mauriciolobo/developer

Developer