Merge pull request #1 from if-050java/master

fix
bug fix
Merge pull request #5 from jimmy-sv/master

bug fix