small fixed
fixes
fix oni playing
fix merge
Merge pull request #6 from jeanbroid/BBB

merge ok