Merge pull request #1 from erlerobot/master

Alimentación 05-05-14
Merge pull request #3 from pmayoral/master

Merge pull request #1 from erlerobot/master