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

This reverts commit 613e4773d872c4a4f4546b3f2c95cd41a0612664.