Merge pull request #62 from JetAlone/develop-qm

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

Develop qm
Merge branch 'develop' into develop-qm