[Pr] punt trigo stuf
Merge pull request #26 from hodorcage/master

[Pr] punt trigo stuf