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

This reverts commit d6b2717aedb50712bb51a3e6645f126e847c9569.