Merge pull request #11 from dquinteros/master

Push
Merge pull request #10 from wigtor/master

Pull