Merge pull request #34 from Porquepix/master

gg