Fixed crashing.
Merge branch 'master' of github.com:csulbacm/LavaWhales