Merge pull request #34 from dquinteros/master

Push
Merge pull request #18 from wigtor/master

pull