Merge branch 'thomas' of https://github.com/Mugiwaranojo/QCMPlus into mugiwara