BUGGASSO LOCO!!
Merge pull request #25 from danibram/master

BUG BUG BUG BUG