Merge pull request #6 from lmacha02/luisDevelopment

merge 20/12/14
Merge pull request #9 from lmacha02/master

Merge pull request #6 from lmacha02/luisDevelopment
tests
Merge pull request #12 from lmacha02/luisDevelopment

Luis development