Adding 3D support, rotating, scale and other stuff
Merge correction linux