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