Fix inverse matrix transformation
Optimize previous commit
Merge branch 'Zeken-master'