fix
Merge https://github.com/Showmee/JavaStuff
fix2