Merge remote-tracking branch 'upstream/master'

merging
form val fix and quick clean up
Merge branch 'master' of github.com:pandafulmanda/HPLMinecraftClass

hi!