merge
Merge pull request #1133 from diegosarmentero/master

Fixed live threads with perrito