Merge pull request #318 from cl0ck/Dev

SQM+
Joker's Textures