Fixed some of the public stuff
Merge branch 'master' of http://github.com/apourchet/BigRedHack14