update collision
Merge pull request #49 from winstonho/master

update collision