Merge pull request #562 from RandyGaul/box2d