WIP: Bug391 Improve + Refactor + Test #34

Closed
liuyixiu wants to merge 2 commits from Bug391-LiuYiXiu into master

2 Commits (master)