fix bugs
Merge branch 'dev' of https://github.com/phoenix747/plumber into dev