Merge pull request #116 from smigolpol/master

Machine Texture fixes.