Merge pull request #90 from Kiroshima/master

Scene Fixes
Merge https://github.com/JohnMai/WhiteSharks