Fix the language selector... Resolves issue #420.
Merge pull request #424 from evertton/master

Fix language selector... issue #420.