Change uniforms system
Merge pull request #4 from tomaka/new-uniforms-system

Change uniforms system