changed controller to handle minification
Merge branch 'ovarunendra-v0.4' into v0.4