Set language redirect value.
code uncommented and cleanup
Merge branch 'master' into issue#164issue#166