Merge pull request #17 from wigtor/master

Pull
Merge pull request #34 from dquinteros/master

Push