Merge pull request #549 from RandyGaul/3d-access