Merge branch 'master' of https://github.com/cnberg/Qing
Merge branch 'master' of https://github.com/cnberg/Qing