rm qix
Merge pull request #894 from Singly/rm-qix

rm qix
Merge branch 'master' into cleaner