my fix
fix build
fix bug war
Merge pull request #5 from blaskred/master

pull