Merge pull request #93 from JetAlone/develop

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

Merge pull request #93 from JetAlone/develop