Merge pull request #563 from RandyGaul/box3d