Merge pull request #10 from calfjohn/master

fixed a bug
fixed collision bug