[fix] update bootstrap + fix collide
Merge pull request #46 from julianduque/master

[fix] update bootstrap + fix collide