Closes #1017
Merge pull request #1032 from xoppa/3dapi

Closes #1017