Improve code for selecting language
Replace method with code
Merge master and solve conflict
Merge pull request #64 from Pico88/language-method

Improve code for selecting language