Merge pull request #48 from winstonho/master

update
Merge pull request #49 from winstonho/master

update collision
update
Merge pull request #19 from huanzhz/master

m49