fixed bug, WARNING: still crashes after a few seconds
Merge branch 'master' of github.com:brainpower/Maximum-Fish