Uniforms reform
Merge pull request #173 from tomaka/uniforms-reform

Uniforms reform