Merge pull request #5 from cheile01/master

20/12/14
Merge pull request #11 from lmacha02/origin/luisDevelopment

Merge pull request #5 from cheile01/master