Merge pull request #13 from wigtor/master

Pull
arreglo del error de php
Merge pull request #20 from dquinteros/master

Push