Merge pull request #38 from Infernus444/master

Fixes and stuff
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines