Merge branch '3d'
Update usage with --3d