Revert "Revert "Merge branch 'master' of https://github.com/Varkin/QPQuadProQuo""

This reverts commit 27c721e50a3e6c627a2735bc3eed0f2800d2aadb.