Merge pull request #93 from JetAlone/develop

Develop qm