Quadris v1
Merge github.com:markshang/quadris