Merge pull request #3 from jimmy-sv/master

bug fix
hotfix
Merge pull request #4 from DrBAXA/master

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

fix