Bullet refactor
small tweaks
Merge branch 'developement'