Colliderboxes a little better
Merge branch 'master' of https://github.com/flanr/GPIBase