Merge pull request #122 from JetAlone/develop-qm

Develop qm
Merge pull request #123 from JetAlone/develop-qm

Develop qm
Merge pull request #125 from JetAlone/develop-qm

Develop qm
Merge branch 'master' into develop