Merge pull request #85 from dquinteros/master

push
Merge pull request #32 from wigtor/master

pull