Udpate
Merge pull request #98 from JetAlone/develop-qm

Udpate