merge #9

Open
pc98szriu wants to merge 6 commits from qz_branch into master

6 Commits (master)