blafa
Merge pull request #1 from magujs/master

Blafa changes