Using local vars.
Merge branch '36-mvc'