Fixed Normals
Merge remote-tracking branch 'origin/master' into Programming_features