Zyq #43

Closed
dreamglade wants to merge 4 commits from Zyq into master