Expand controllers with initial value
Merge branch 'shaders'
Merge branch 'master' into gh-pages