Merge pull request #3 from Aurorastation/development

Development
Uniform fixes!

Yess, fixed'em!
Merge pull request #4 from Aurorastation/master

Update
Merge pull request #27 from skull132/master

Uniform fixes