Merge pull request #1 from Just-CJ/master

Done.
Can add cones and cylinders now. The normals of cones are not added yet.
Merge pull request #3 from Parareru/master

merge