Merge pull request #317 from cl0ck/Dev

Updated SQM
SQM+