Fixed voexl Faces
Merge branch 'steven' into development