Issue #392 revert old version of language selection, partial resolve
fix Issue #394
Merge pull request #398 from hellsingblack/master

fix bug #394