Fixed some stuff.
Merge branch 'master' of https://github.com/turbo-santa/turbo-santa-common