Streamlined the math for bounding boxes
Fixed conflict
Merge pull request #474 from ntwitch/master

Streamlined math for bounding boxes.