Issue #3 fix candidate
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from Proyecto513/master

Issue #3 solution (aparently)