Merge pull request #6 from lmacha02/luisDevelopment

merge 20/12/14