fixed some bug, forgot what

fixed some bug, forgot what
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks