Removed CoolFish until I work out the bugs
Merge branch 'develop'