Stuff for gills
Merge branch 'master' of https://github.com/Kallehz/Panda2014.git