Remove hack in uniforms
Merge pull request #69 from tomaka/rework-uniforms

Remove hack in uniforms