Merge pull request #3 from Pallevante/bq

Collision detection