Added Pyramid primitive.
Merge branch 'primitives' into dev