Merge branch 'develop' into develop-qm
Merge pull request #67 from JetAlone/develop-qm

Merge branch 'develop' into develop-qm