Dev 2 is back
Merge pull request #4 from mauriciolobo/dev2

Dev 2 is back