bwj
Merge pull request #6 from x469298511/master

bug 改正