fixbug
Merge branch 'trunk' of https://github.com/voer-platform/vpw into trunk