Updated collision. Fixes #20